1 files changed, 9 insertions, 3 deletions
diff --git a/share/spack/templates/container/Dockerfile b/share/spack/templates/container/Dockerfile
index c23ad64188..67b8986a00 100644
--- a/share/spack/templates/container/Dockerfile
+++ b/share/spack/templates/container/Dockerfile
@@ -1,3 +1,8 @@
+{% if render_phase.bootstrap %}
+{{ bootstrap.recipe }}
+
+{% endif %}
+{% if render_phase.build %}
 # Build stage with Spack pre-installed and ready to be used
 FROM {{ build.image }} as builder
 
@@ -35,7 +40,8 @@ RUN cd {{ paths.environment }} && \
 {% if extra_instructions.build %}
 {{ extra_instructions.build }}
 {% endif %}
-
+{% endif %}
+{% if render_phase.final %}
 # Bare OS image to run the installed executables
 FROM {{ run.image }}
 
@@ -49,12 +55,12 @@ RUN {% if os_package_update %}{{ os_packages_final.update }} \
  && {% endif %}{{ os_packages_final.install }} {{ os_packages_final.list | join | replace('\n', ' ') }} \
  && {{ os_packages_final.clean }}
 {% endif %}
-
 {% if extra_instructions.final %}
+
 {{ extra_instructions.final }}
 {% endif %}
 {% for label, value in labels.items() %}
 LABEL "{{ label }}"="{{ value }}"
 {% endfor %}
-
 ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l"]
+{% endif %}