containers/debian/base.Dockerfile

@@ -45,6 +45,9 @@ apt-get -yqq install --no-install-recommends                            \
         less                                                            \
         libcbor-xs-perl                                                 \
         libjson-xs-perl                                                 \
+        libgl-dev                                                      \
+        libglx-dev                                                      \
+        libopengl-dev                                                   \
         locales                                                         \
         lua-posix                                                       \
         make                                                            \

containers/jug/dev.Dockerfile

@@ -51,11 +51,12 @@ SHELL ["docker-shell"]
 ## Setup build configuration
 ARG jobs=64
 RUN <<EOF
-set -ex
+set -e
 declare -A target=(["linux/amd64"]="x86_64_v2" ["linux/arm64"]="aarch64")
 target=${target[${TARGETPLATFORM}]}
 spack config --scope site add "packages:all:require:[target=${target}]"
 spack config --scope site add "packages:all:target:[${target}]"
+spack external find --scope site llvm
 spack config blame packages
 spack config --scope user add "config:suppress_gpg_warnings:true"
 spack config --scope user add "config:build_jobs:${jobs}"
@@ -70,7 +71,7 @@ EOF
 
 ## Setup local buildcache mirrors
 RUN --mount=type=cache,target=/var/cache/spack <<EOF
-set -ex
+set -e
 spack mirror add local /var/cache/spack/mirror/${SPACK_VERSION}
 spack buildcache update-index local
 spack mirror list
@@ -82,7 +83,7 @@ EOF
 ARG S3_ACCESS_KEY=""
 ARG S3_SECRET_KEY=""
 RUN --mount=type=cache,target=/var/cache/spack <<EOF
-set -ex
+set -e
 if [ -n "${S3_ACCESS_KEY}" ] ; then
   spack mirror add --scope site                                         \
       --s3-endpoint-url https://eics3.sdcc.bnl.gov:9000                 \
@@ -100,7 +101,7 @@ ARG EICSPACK_VERSION="$SPACK_VERSION"
 ARG EICSPACK_CHERRYPICKS=""
 ADD https://api.github.com/repos/${EICSPACK_ORGREPO}/commits/${EICSPACK_VERSION} /tmp/eic-spack.json
 RUN <<EOF
-set -ex
+set -e
 git clone --filter=tree:0 https://github.com/${EICSPACK_ORGREPO}.git ${EICSPACK_ROOT}
 git -C ${EICSPACK_ROOT} checkout ${EICSPACK_VERSION}
 if [ -n "${EICSPACK_CHERRYPICKS}" ] ; then
@@ -115,7 +116,7 @@ ARG KEY4HEPSPACK_ORGREPO="key4hep/key4hep-spack"
 ARG KEY4HEPSPACK_VERSION="main"
 ADD https://api.github.com/repos/${KEY4HEPSPACK_ORGREPO}/commits/${KEY4HEPSPACK_VERSION} /tmp/key4hep-spack.json
 RUN <<EOF
-set -ex
+set -e
 git clone --filter=tree:0 https://github.com/${KEY4HEPSPACK_ORGREPO}.git ${KEY4HEPSPACK_ROOT}
 git -C ${KEY4HEPSPACK_ROOT} checkout ${KEY4HEPSPACK_VERSION}
 spack repo add --scope site "${KEY4HEPSPACK_ROOT}"
@@ -140,13 +141,14 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM}              \
     --mount=type=cache,target=/var/cache/spack                          \
     --mount=type=secret,id=mirrors,target=/opt/spack/etc/spack/mirrors.yaml \
     <<EOF
-set -ex
+set -e
 export CCACHE_DIR=/ccache
 spack buildcache update-index local
 spack buildcache update-index eics3rw
 spack env activate --dir ${SPACK_ENV}
 spack add juggler@git.${JUGGLER_VERSION}
 spack add eicrecon@git.${EICRECON_VERSION}
+spack concretize --fresh --force --quiet
 make --jobs ${jobs} --keep-going --directory /opt/spack-environment SPACK_ENV=${SPACK_ENV} BUILDCACHE_MIRROR="local eics3rw"
 ccache --show-stats
 ccache --zero-stats
@@ -154,7 +156,7 @@ EOF
 
 ## Create view at /usr/local
 RUN --mount=type=cache,target=/var/cache/spack <<EOF
-set -ex
+set -e
 spack env activate --dir ${SPACK_ENV}
 rm -r /usr/local
 spack env view enable /usr/local
@@ -170,7 +172,7 @@ EOF
 
 ## Store environment
 RUN <<EOF
-set -ex
+set -e
 spack env activate --sh --dir ${SPACK_ENV} > /etc/profile.d/z10_spack_environment.sh
 EOF
 

eic-spack.sh

@@ -3,7 +3,7 @@ EICSPACK_ORGREPO="eic/eic-spack"
 
 ## EIC spack commit hash or github version, e.g. v0.19.7
 ## note: nightly builds could use a branch e.g. releases/v0.19
-EICSPACK_VERSION="1d2956a5f87ada2bf04ed1bdee761baf81b85feb"
+EICSPACK_VERSION="1ef77b3b596e5b335366a90a16156c43a85f65c7"
 
 ## Space-separated list of eic-spack cherry-picks
 read -r -d '' EICSPACK_CHERRYPICKS <<- \

spack-environment/dev/spack.yaml

@@ -5,7 +5,6 @@ spack:
   specs:
     - acts
     - actsvg
-    - acts-dd4hep
     - afterburner
     - algorithms
     - cairo
@@ -17,7 +16,7 @@ spack:
     - cppcoro
     - dawn
     - dawncut
-    - dd4hep
+    - dd4hep +ddeve
     - dpmjet
     - east
     - edm4eic

spack-environment/packages.yaml

@@ -149,6 +149,9 @@ packages:
   lcov:
     require:
     - '@1.16'
+  libglx:
+    require:
+    - opengl
   lhapdf:
     require:
     - '@6.5.1'
@@ -159,7 +162,7 @@ packages:
   mesa:
     require:
     - '@22.1.6'
-    - +glx -llvm +opengl +opengles +osmesa
+    - +glx +llvm +opengl +opengles +osmesa
   nlohmann-json:
     require:
     - '@3.11.2'
@@ -175,6 +178,10 @@ packages:
     require:
     - '@7.7.1'
     - +application_framework -vtk
+  opengl:
+    externals:
+    - spec: opengl@4.6
+      prefix: /usr
   osg-ca-certs:
     require:
     - '@1.109.igtf.1.117'
@@ -286,8 +293,8 @@ packages:
   root:
     require:
     - '@6.28.04'
-    - cxxstd=17 +fftw +fortran +gdml +http -ipo +mlp +pythia8 +root7 +tmva +vc -webgui +xrootd +ssl
-    - any_of: [+opengl +x, -opengl -x]
+    - cxxstd=17 +fftw +fortran +gdml +http -ipo +mlp +pythia8 +root7 +tmva +vc +xrootd +ssl
+    - any_of: [+opengl +webgui +x, -opengl -webgui -x]
   snakemake:
     require:
     - '@7.22.0'

spack-environment/prod/spack.yaml

@@ -5,7 +5,7 @@ spack:
   specs:
     - acts
     - cmake
-    - dd4hep
+    - dd4hep -ddeve
     - edm4eic
     - fastjet
     - fjcontrib