zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update containerize templates to account for view indirection (#31321)

Browse Source 
fixes #30965
This commit is contained in:
Massimiliano Culpo 2022-06-29 15:39:18 +02:00 committed by GitHub
parent 58b144c0da
commit 557abe04ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/spack/spack/container/writers/__init__.py
View File

@ -171,11 +171,12 @@ def strip(self):
def paths(self): def paths(self):
"""Important paths in the image""" """Important paths in the image"""
Paths = collections.namedtuple('Paths', [ Paths = collections.namedtuple('Paths', [
'environment', 'store', 'view' 'environment', 'store', 'hidden_view', 'view'
]) ])
return Paths( return Paths(
environment='/opt/spack-environment', environment='/opt/spack-environment',
store='/opt/software', store='/opt/software',
hidden_view='/opt/._view',
view='/opt/view' view='/opt/view'
) )

1
share/spack/templates/container/Dockerfile
View File

@ -47,6 +47,7 @@ FROM {{ run.image }}
COPY --from=builder {{ paths.environment }} {{ paths.environment }} COPY --from=builder {{ paths.environment }} {{ paths.environment }}
COPY --from=builder {{ paths.store }} {{ paths.store }} 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 {{ paths.view }} {{ paths.view }}
COPY --from=builder /etc/profile.d/z10_spack_environment.sh /etc/profile.d/z10_spack_environment.sh COPY --from=builder /etc/profile.d/z10_spack_environment.sh /etc/profile.d/z10_spack_environment.sh

1
share/spack/templates/container/singularity.def
View File

@ -56,6 +56,7 @@ Stage: final
%files from build %files from build
{{ paths.environment }} /opt {{ paths.environment }} /opt
{{ paths.store }} /opt {{ paths.store }} /opt
{{ paths.hidden_view }} /opt
{{ paths.view }} /opt {{ paths.view }} /opt
{{ paths.environment }}/environment_modifications.sh {{ paths.environment }}/environment_modifications.sh {{ paths.environment }}/environment_modifications.sh {{ paths.environment }}/environment_modifications.sh