diff options
author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2022-06-29 15:39:18 +0200 |
---|---|---|
committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2022-07-20 08:10:41 +0200 |
commit | 4f40c9aab93673a10325dfe6e78b57ca84788a0e (patch) | |
tree | 7e5b3f3471225de00ccae9d505a3ffbb96f06d5d /share | |
parent | 618161075d3abbc1ab2e3efd38107e54f2c7b8af (diff) | |
download | spack-4f40c9aab93673a10325dfe6e78b57ca84788a0e.tar.gz spack-4f40c9aab93673a10325dfe6e78b57ca84788a0e.tar.bz2 spack-4f40c9aab93673a10325dfe6e78b57ca84788a0e.tar.xz spack-4f40c9aab93673a10325dfe6e78b57ca84788a0e.zip |
Update containerize templates to account for view indirection (#31321)
fixes #30965
Diffstat (limited to 'share')
-rw-r--r-- | share/spack/templates/container/Dockerfile | 1 | ||||
-rw-r--r-- | share/spack/templates/container/singularity.def | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/share/spack/templates/container/Dockerfile b/share/spack/templates/container/Dockerfile index 67b8986a00..be145aef3e 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 |