From 3935e047c612f3c20c2fa7f55f762a2ef529a0c0 Mon Sep 17 00:00:00 2001
From: Massimiliano Culpo <massimiliano.culpo@gmail.com>
Date: Thu, 12 Oct 2023 12:12:15 +0200
Subject: Remove deprecated "extra_instructions" option for containers (#40365)

---
 share/spack/templates/container/Dockerfile      | 7 -------
 share/spack/templates/container/singularity.def | 6 ------
 2 files changed, 13 deletions(-)

(limited to 'share')

diff --git a/share/spack/templates/container/Dockerfile b/share/spack/templates/container/Dockerfile
index 27c2dbf5cf..2fad37affb 100644
--- a/share/spack/templates/container/Dockerfile
+++ b/share/spack/templates/container/Dockerfile
@@ -39,9 +39,6 @@ RUN find -L {{ paths.view }}/* -type f -exec readlink -f '{}' \; | \
 RUN cd {{ paths.environment }} && \
     spack env activate --sh -d . > activate.sh
 
-{% if extra_instructions.build %}
-{{ extra_instructions.build }}
-{% endif %}
 {% endblock build_stage %}
 {% endif %}
 
@@ -70,10 +67,6 @@ 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 %}
 {% endblock final_stage %}
 {% for label, value in labels.items() %}
 LABEL "{{ label }}"="{{ value }}"
diff --git a/share/spack/templates/container/singularity.def b/share/spack/templates/container/singularity.def
index 4184db92b6..3b8f57dfb1 100644
--- a/share/spack/templates/container/singularity.def
+++ b/share/spack/templates/container/singularity.def
@@ -39,9 +39,6 @@ EOF
     grep 'x-executable\|x-archive\|x-sharedlib' | \
     awk -F: '{print $1}' | xargs strip
 {% endif %}
-{% if extra_instructions.build %}
-{{ extra_instructions.build }}
-{% endif %}
 {% endblock build_stage %}
 {% if apps %}
 {% for application, help_text in apps.items() %}
@@ -80,9 +77,6 @@ Stage: final
 {% endif %}
   # Modify the environment without relying on sourcing shell specific files at startup
   cat {{ paths.environment }}/environment_modifications.sh >> $SINGULARITY_ENVIRONMENT
-{% if extra_instructions.final %}
-{{ extra_instructions.final }}
-{% endif %}
 {% endblock final_stage %}
 {% if runscript %}
 
-- 
cgit v1.2.3-70-g09d2