diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2023-10-12 12:12:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-12 12:12:15 +0200 |
| commit | 3935e047c612f3c20c2fa7f55f762a2ef529a0c0 (patch) | |
| tree | 1a44f3fa6a83bf1e3874ad782829a6e20ce9b9fa /share | |
| parent | 0fd2427d9b1c27c02d16075a0cc8fa2626e7ae73 (diff) | |
| download | spack-3935e047c612f3c20c2fa7f55f762a2ef529a0c0.tar.gz spack-3935e047c612f3c20c2fa7f55f762a2ef529a0c0.tar.bz2 spack-3935e047c612f3c20c2fa7f55f762a2ef529a0c0.tar.xz spack-3935e047c612f3c20c2fa7f55f762a2ef529a0c0.zip | |
Remove deprecated "extra_instructions" option for containers (#40365)
Diffstat (limited to 'share')
| -rw-r--r-- | share/spack/templates/container/Dockerfile | 7 | ||||
| -rw-r--r-- | share/spack/templates/container/singularity.def | 6 |
2 files changed, 0 insertions, 13 deletions
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 %} |