summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2022-06-29 15:39:18 +0200
committerGitHub <noreply@github.com>2022-06-29 15:39:18 +0200
commit557abe04ecb29a26032c62e098aadd76b3905abe (patch)
tree8d7f6576efc1c50a00fff1f7464426317ac7d0cc /share
parent58b144c0dae88d6a06d3d138c077c4c70909c5f7 (diff)
downloadspack-557abe04ecb29a26032c62e098aadd76b3905abe.tar.gz
spack-557abe04ecb29a26032c62e098aadd76b3905abe.tar.bz2
spack-557abe04ecb29a26032c62e098aadd76b3905abe.tar.xz
spack-557abe04ecb29a26032c62e098aadd76b3905abe.zip
Update containerize templates to account for view indirection (#31321)
fixes #30965
Diffstat (limited to 'share')
-rw-r--r--share/spack/templates/container/Dockerfile1
-rw-r--r--share/spack/templates/container/singularity.def1
2 files changed, 2 insertions, 0 deletions
diff --git a/share/spack/templates/container/Dockerfile b/share/spack/templates/container/Dockerfile
index d7d5e14731..bee6cd2373 100644
--- a/share/spack/templates/container/Dockerfile
+++ b/share/spack/templates/container/Dockerfile
@@ -47,6 +47,7 @@ FROM {{ run.image }}
COPY --from=builder {{ paths.environment }} {{ paths.environment }}
COPY --from=builder {{ paths.store }} {{ paths.store }}
+COPY --from=builder {{ paths.hidden_view }} {{ paths.hidden_view }}
COPY --from=builder {{ paths.view }} {{ paths.view }}
COPY --from=builder /etc/profile.d/z10_spack_environment.sh /etc/profile.d/z10_spack_environment.sh
diff --git a/share/spack/templates/container/singularity.def b/share/spack/templates/container/singularity.def
index de0392b718..cfe5a2919d 100644
--- a/share/spack/templates/container/singularity.def
+++ b/share/spack/templates/container/singularity.def
@@ -56,6 +56,7 @@ Stage: final
%files from build
{{ paths.environment }} /opt
{{ paths.store }} /opt
+ {{ paths.hidden_view }} /opt
{{ paths.view }} /opt
{{ paths.environment }}/environment_modifications.sh {{ paths.environment }}/environment_modifications.sh