Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package spack for openSUSE:Factory checked
in at 2023-01-31 16:09:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spack (Old)
and /work/SRC/openSUSE:Factory/.spack.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spack"
Tue Jan 31 16:09:55 2023 rev:27 rq:1062188 version:0.19.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/spack/spack.changes 2023-01-12
22:44:59.905102453 +0100
+++ /work/SRC/openSUSE:Factory/.spack.new.32243/spack.changes 2023-01-31
16:21:24.462031288 +0100
@@ -1,0 +2,7 @@
+Tue Jan 31 08:29:00 UTC 2023 - Egbert Eich <e...@suse.com>
+
+- Make sure the spack environment is set up correctly in
+ spack-generated Dockerfiles (boo#1207784):
+ Make-sure-spack-environment-is-set-up-in-Dockerfile-template.patch
+
+-------------------------------------------------------------------
New:
----
Make-sure-spack-environment-is-set-up-in-Dockerfile-template.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spack.spec ++++++
--- /var/tmp/diff_new_pack.kn1RM3/_old 2023-01-31 16:21:24.994034493 +0100
+++ /var/tmp/diff_new_pack.kn1RM3/_new 2023-01-31 16:21:24.998034517 +0100
@@ -55,6 +55,7 @@
Patch7: Fix-Spinx-configuration-to-avoid-throwing-errors.patch
Patch8: Set-modules-default-to-lmod.patch
Patch9:
Add-support-for-container-building-using-a-SLE-base-container.patch
+Patch100:
Make-sure-spack-environment-is-set-up-in-Dockerfile-template.patch
%if %{without doc}
BuildRequires: fdupes
BuildRequires: lua-lmod
++++++ Make-sure-spack-environment-is-set-up-in-Dockerfile-template.patch ++++++
From: Egbert Eich <e...@suse.com>
Date: Tue Jan 31 09:24:46 2023 +0100
Subject: Make sure spack environment is set up in Dockerfile template
Patch-mainline: Not yet
Git-commit: 865116877fe2536485326aa0fb53943160fa5e25
References:
The Dockerfile template did source the script
/opt/spack/share/spack/setup-env.sh
which lead to the binary 'spack' not being found and the
environment not being set up properly for `spack env activate .`.
Signed-off-by: Egbert Eich <e...@suse.com>
Signed-off-by: Egbert Eich <e...@suse.de>
---
share/spack/templates/container/Dockerfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/share/spack/templates/container/Dockerfile
b/share/spack/templates/container/Dockerfile
index b10dcf08..dc9b91e5 100644
--- a/share/spack/templates/container/Dockerfile
+++ b/share/spack/templates/container/Dockerfile
@@ -19,7 +19,8 @@ RUN mkdir {{ paths.environment }} \
{{ manifest }} > {{ paths.environment }}/spack.yaml
# Install the software, remove unnecessary deps
-RUN cd {{ paths.environment }} && spack env activate . && spack install
--fail-fast && spack gc -y
+RUN . /opt/spack/share/spack/setup-env.sh && \
+ cd {{ paths.environment }} && spack env activate . && spack install
--fail-fast && spack gc -y
{% if strip %}
# Strip all the binaries
@@ -31,7 +32,7 @@ RUN find -L {{ paths.view }}/* -type f -exec readlink -f '{}'
\; | \
{% endif %}
# Modifications to the environment that are necessary to run
-RUN cd {{ paths.environment }} && \
+RUN . /opt/spack/share/spack/setup-env.sh && cd {{ paths.environment }} && \
spack env activate --sh -d . >> /etc/profile.d/z10_spack_environment.sh
{% if extra_instructions.build %}
