Fix spack images

.github/workflows/spack_docker_images.yml

@@ -1,7 +1,7 @@
 name: Spack images
 on:
   schedule: [ { cron: "50 23 * * 0" } ] # run every Sunday 23h50
-  push: { branches: [ main, 'v*' ] }
+  push: { branches: [ main, 'v*'] }
   pull_request:
   workflow_dispatch:
     inputs:

spack/2-spackbase/Dockerfile

@@ -1,6 +1,7 @@
 ARG IMAGE_TAG
+ARG REGISTRY=ghcr.io/pdidev/test_env
 
-FROM ghcr.io/pdidev/test_env/base:${IMAGE_TAG}
+FROM ${REGISTRY}/base:${IMAGE_TAG}
 
 LABEL "org.opencontainers.image.source"="https://github.com/pdidev/test_env"
 

spack/3-baselibs/Dockerfile

@@ -1,12 +1,12 @@
 ARG VERSION
 ARG COMPILER
 ARG IMAGE_TAG
+ARG REGISTRY=ghcr.io/pdidev/test_env
 
-FROM ghcr.io/pdidev/test_env/spackbase:${IMAGE_TAG}
+FROM ${REGISTRY}/spackbase:${IMAGE_TAG}
 
 LABEL "org.opencontainers.image.source"="https://github.com/pdidev/test_env"
 
-
 ARG VERSION
 
 # Download spack
@@ -36,18 +36,24 @@ ARG COMPILER
 ARG SPACK_INSTALL_ARGS="--show-log-on-error --fail-fast"
 
 # Install the spack compiler with our latest system compiler
-COPY ${COMPILER}.lst compilerpkg.lst
-RUN spack solve -I -U \
-          "$(cat compilerpkg.lst)%$(spack compilers | tr ' ' '\n' | grep @)" \
- && spack install ${SPACK_INSTALL_ARGS} -U \
-          "$(cat compilerpkg.lst)%$(spack compilers | tr ' ' '\n' | grep @)"
-
-
+COPY ${COMPILER}.lst compilerpkg.lst 
+RUN <<EORUN
+set -e
+COMPILER_PKG="$(cat compilerpkg.lst)"
+SPACK_VERSION="$(spack compilers | tr ' ' '\n' | grep @)"
+# Select the ~bootstrap gcc variant as the 3-stage bootstrap fails on latest spack
+if [[ "$COMPILER_PKG" == gcc* ]]
+then
+  BOOT="~bootstrap"
+else
+  BOOT=""
+fi
+spack install ${SPACK_INSTALL_ARGS} -U "${COMPILER_PKG}${BOOT}%${SPACK_VERSION}"
+EORUN
 # Prevent building any new compiler
 RUN spack config --scope site add 'packages:llvm:buildable: false'
 RUN spack config --scope site add 'packages:gcc:buildable: false'
 
-
 # Generate a compiler ref
 # * before 1.0, rely on the compilers section and generate a mixed compiler for llvm
 # * from spack 1.0 on, define a toolchain
@@ -86,39 +92,42 @@ else
 fi
 EORUN
 
-
-# Install an environment with our base libraries using the compiler ref we just generated
+# Create an environment with our base libraries using the compiler ref we just generated
 COPY <<'EOCOPY' spack.yaml
 spack:
   view: false
   definitions:
   - buildeps: []
-  - compiler: []
   - libs: []
   - mpi: []
   - mpilibs: []
   specs:
-  - '$buildeps'
-  - matrix:
-    - ['$%compiler']
-    - - '$libs'
-      - '$mpi'
-  - matrix:
-    - ['$%compiler']
-    - ['$^mpi']
-    - ['$mpilibs']
+  - $buildeps
+  - $libs
+  - $mpi
+  - $mpilibs
 EOCOPY
 RUN spack env create pdienv spack.yaml
 COPY deps.sh deps.sh
-RUN . deps.sh && spack -e pdienv add -l buildeps ${BASE_BUILDDEPS}
-RUN . deps.sh && spack -e pdienv add -l libs     ${BASE_LIBS}
-RUN <<EORUN
+
+# The toolchain is attached directly to each lib spec (string-parsed), which
+# avoids the matrix that crashes in expand_toolchains on latest spack
+RUN <<'EORUN'
 set -e
-if ( spack --version | grep -qs '^1\.' )
-then spack -e pdienv add -l compiler pditoolchain
-else spack -e pdienv add -l compiler "$(spack compilers | tr ' ' '\n' | grep @)"
+. deps.sh
+if spack --version | grep -qs '^1\.'
+then COMPILER_REF="%pditoolchain"
+else COMPILER_REF="%$(spack compilers | tr ' ' '\n' | grep @)"
 fi
+for p in ${BASE_BUILDDEPS}; do
+    spack -e pdienv add -l buildeps "$p ${COMPILER_REF}"
+done
+for p in ${BASE_LIBS}; do
+  spack -e pdienv add -l libs "$p ${COMPILER_REF}"
+done
 EORUN
+
+# Concretize, fetch, install 
 RUN spack -e pdienv concretize --reuse
 RUN spack -e pdienv fetch \
  || spack -e pdienv fetch \

spack/3-baselibs/clang.lst

@@ -1 +1 @@
-llvm+llvm_dylib+link_llvm_dylib~lldb
+llvm+llvm_dylib+link_llvm_dylib~lldb+gold

spack/4-mini/Dockerfile

@@ -2,8 +2,9 @@ ARG VERSION
 ARG COMPILER
 ARG MPI
 ARG IMAGE_TAG
+ARG REGISTRY=ghcr.io/pdidev/test_env
 
-FROM ghcr.io/pdidev/test_env/builder:${VERSION}-${COMPILER}-baselibs-${IMAGE_TAG}
+FROM ${REGISTRY}/builder:${VERSION}-${COMPILER}-baselibs-${IMAGE_TAG}
 
 LABEL "org.opencontainers.image.source"="https://github.com/pdidev/test_env"
 
@@ -12,7 +13,7 @@ ARG MPI
 ARG SPACK_INSTALL_ARGS="--show-log-on-error --fail-fast"
 
 # Add our MPI of choice and base MPI-dependant libs to the environment and install it
-RUN              spack -e pdienv add -l mpi    "${MPI}"
+RUN spack -e pdienv add -l mpi "${MPI}"
 RUN . deps.sh && spack -e pdienv add -l mpilibs ${BASE_MPILIBS}
 RUN spack -e pdienv concretize -f --reuse
 RUN spack -e pdienv install ${SPACK_INSTALL_ARGS}

spack/5-all/Dockerfile

@@ -2,12 +2,12 @@ ARG VERSION
 ARG COMPILER
 ARG MPI
 ARG IMAGE_TAG
+ARG REGISTRY=ghcr.io/pdidev/test_env
 
-FROM ghcr.io/pdidev/test_env/builder:${VERSION}-${COMPILER}-${MPI}-mini-${IMAGE_TAG}
+FROM ${REGISTRY}/builder:${VERSION}-${COMPILER}-${MPI}-mini-${IMAGE_TAG}
 
 LABEL "org.opencontainers.image.source"="https://github.com/pdidev/test_env"
 
-
 # before 1.0, add the external repo for paraconf
 RUN <<EORUN
 set -e
@@ -19,7 +19,6 @@ then
 fi
 EORUN
 
-
 ARG SPACK_INSTALL_ARGS="--show-log-on-error --fail-fast"
 
 # Add the optional libraries to our environment and install it

spack/6-finalize/Dockerfile

@@ -3,8 +3,9 @@ ARG COMPILER
 ARG MPI
 ARG LIBS
 ARG IMAGE_TAG
+ARG REGISTRY=ghcr.io/pdidev/test_env
 
-FROM ghcr.io/pdidev/test_env/builder:${VERSION}-${COMPILER}-${MPI}-${LIBS}-${IMAGE_TAG} AS builder
+FROM ${REGISTRY}/builder:${VERSION}-${COMPILER}-${MPI}-${LIBS}-${IMAGE_TAG} AS builder
 
 LABEL "org.opencontainers.image.source"="https://github.com/pdidev/test_env"
 
@@ -94,7 +95,7 @@ RUN spack clean -a
 
 
 
-FROM ghcr.io/pdidev/test_env/base:${IMAGE_TAG} AS main
+FROM ${REGISTRY}/base:${IMAGE_TAG} AS main
 
 COPY --from=builder ${SPACK_INSTALL} ${SPACK_INSTALL}
 COPY --from=builder ${SPACK_MODULES} ${SPACK_MODULES}
@@ -133,7 +134,7 @@ CMD ["bash", "-i"]
 
 
 
-FROM ghcr.io/pdidev/test_env/spackbase:${IMAGE_TAG} AS fullspack
+FROM ${REGISTRY}/spackbase:${IMAGE_TAG} AS fullspack
 
 
 COPY --from=builder --chown=ci:ci ${SPACK_INSTALL} ${SPACK_INSTALL}
@@ -158,19 +159,11 @@ FROM alpine/git AS pdidl
 
 RUN git -C /root clone --recurse-submodules https://github.com/pdidev/pdi.git /root/pdi
 
-
-
-
-
 FROM main AS test
 
 COPY --from=pdidl --chown=ci:ci /root/pdi /home/ci/pdi
 
 RUN export VERBOSE=1 \
  && bash pdi/bin/build_and_run_all_tests
 
-
-
-
-
 FROM main