Fix up Dockerfile.template.
Various corrections.