From 557abe04ecb29a26032c62e098aadd76b3905abe Mon Sep 17 00:00:00 2001
From: Massimiliano Culpo <massimiliano.culpo@gmail.com>
Date: Wed, 29 Jun 2022 15:39:18 +0200
Subject: Update containerize templates to account for view indirection
(#31321)
fixes #30965
---
lib/spack/spack/container/writers/__init__.py | 3 ++-
share/spack/templates/container/Dockerfile | 1 +
share/spack/templates/container/singularity.def | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/spack/spack/container/writers/__init__.py b/lib/spack/spack/container/writers/__init__.py
index 9b38b8162f..e9541e91e7 100644
--- a/lib/spack/spack/container/writers/__init__.py
+++ b/lib/spack/spack/container/writers/__init__.py
@@ -171,11 +171,12 @@ class PathContext(tengine.Context):
def paths(self):
"""Important paths in the image"""
Paths = collections.namedtuple('Paths', [
- 'environment', 'store', 'view'
+ 'environment', 'store', 'hidden_view', 'view'
])
return Paths(
environment='/opt/spack-environment',
store='/opt/software',
+ hidden_view='/opt/._view',
view='/opt/view'
)
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
--
cgit v1.2.3-70-g09d2