Cleaned up container config for different init styles.
Updated docker.