containers/jug/dev.Dockerfile

@@ -218,22 +218,21 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
       name="jug_xl" \
       march="$TARGETPLATFORM"
 
-## copy over everything we need from staging in a single layer :-)
-RUN --mount=from=staging,target=/staging                                \
-    rm -rf /usr/local                                                   \
- && cp -r /staging/opt/spack /opt/spack                                 \
- && cp -r /staging/opt/spack-environment /opt/spack-environment         \
- && cp -r /staging/opt/software /opt/software                           \
- && cp -r /staging/usr/._local /usr/._local                             \
- && cd /usr/._local                                                     \
- && PREFIX_PATH=$(realpath $(ls | tail -n1))                            \
+## copy over everything we need from staging
+COPY --from=staging /opt/spack /opt/spack
+COPY --from=staging /opt/spack-environment /opt/spack-environment
+COPY --from=staging /opt/software /opt/software
+COPY --from=staging /usr/._local /usr/._local
+COPY --from=staging /etc/profile.d /etc/profile.d
+COPY --from=staging /etc/jug_info /etc/jug_info
+COPY --from=staging /etc/eic-env.sh /etc/eic-env.sh
+COPY --from=staging /.singularity.d /.singularity.d
+
+## ensure /usr/local link is pointing to the right view
+RUN rm -rf /usr/local                                                   \
+ && PREFIX_PATH=$(realpath $(ls /usr/._local/ | tail -n1))              \
  && echo "Found spack true prefix path to be $PREFIX_PATH"              \
- && cd -                                                                \
- && ln -s ${PREFIX_PATH} /usr/local                                     \
- && cp /staging/etc/profile.d/*.sh /etc/profile.d/                      \
- && cp /staging/etc/eic-env.sh /etc/eic-env.sh                          \
- && cp /staging/etc/jug_info /etc/jug_info                              \
- && cp -r /staging/.singularity.d /.singularity.d                        
+ && ln -s /usr/._local/${PREFIX_PATH} /usr/local
 
 ## set the local spack configuration
 ENV SPACK_DISABLE_LOCAL_CONFIG="true"
@@ -241,6 +240,8 @@ RUN . /opt/spack/share/spack/setup-env.sh                               \
  && spack config --scope site add "config:install_tree:root:~/spack"    \
  && spack config --scope site add "config:source_cache:~/.spack/cache"  \
  && spack config --scope site add "config:binary_index_root:~/.spack"   \
+ && spack config --scope site add "config:environments_root:~/.spack/env" \
+ && spack config --scope site add "config:suppress_gpg_warnings:true"   \
  && spack config blame config                                           \
  && spack config --scope site add "upstreams:eic-shell:install_tree:/opt/software" \
  && spack config blame upstreams

spack.sh

@@ -21,6 +21,7 @@ ea1439dfa11a3996c9927ed792dc9fe4b7efc1b8
 31431f967a59c07585021cba40683c2ca6ff2c47
 316bfd8b7d0d1bc63a7bccf030845775a442a317
 6e47f1645f31ce598d7f1f9770e24b483fb117d9
+63bb2c9bad8acb018f220630e5ce58e4a039d8a2
 ---
 ## Ref: https://github.com/spack/spack/commit/[hash]
 ## [hash]: [description]
@@ -37,3 +38,4 @@ ea1439dfa11a3996c9927ed792dc9fe4b7efc1b8
 ## 31431f967a59c07585021cba40683c2ca6ff2c47: Environment/depfile: fix bug with Git hash versions
 ## 316bfd8b7d0d1bc63a7bccf030845775a442a317: opencascade: new variants
 ## 6e47f1645f31ce598d7f1f9770e24b483fb117d9: opencascade: typo in True
+## 63bb2c9bad8acb018f220630e5ce58e4a039d8a2: py-cryptography: does not run-depend on py-setuptools-rust