diff --git a/containers/jug/xl.Dockerfile b/containers/jug/xl.Dockerfile index ff5d2c9a38d619224e2839fa7e354e3c61d742b5..593631f31888fe91f87a58178fe1559eb75e47e5 100644 --- a/containers/jug/xl.Dockerfile +++ b/containers/jug/xl.Dockerfile @@ -22,47 +22,17 @@ ARG JUG_VERSION=1 RUN cd /tmp \ && echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info -ADD ${EICWEB}/369/repository/tree?ref=${JUGGLER_VERSION} /tmp/369.json -RUN --mount=type=cache,target=/ccache/,sharing=locked,id=${TARGETPLATFORM} \ - cd /tmp \ - && echo "INSTALLING JUGGLER" \ - && git clone -b ${JUGGLER_VERSION} --depth 1 \ - https://eicweb.phy.anl.gov/EIC/juggler.git \ - && export CCACHE_DIR=/ccache \ - && cmake -B build -S juggler \ - -DCMAKE_CXX_FLAGS="-Wno-psabi" \ - -DCMAKE_CXX_STANDARD=17 \ - -DCMAKE_INSTALL_PREFIX=/usr/local \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - && cmake --build build -j${jobs} -- install \ - && pushd juggler \ - && echo " - juggler: ${JUGGLER_VERSION}-$(git rev-parse HEAD)" \ - >> /etc/jug_info \ - && popd \ - && rm -rf build juggler +## Install juggler to the environment +RUN spack add juggler@${JUGGLER_VERSION} \ + && spack concretize \ + && spack install -ADD https://api.github.com/repos/eic/eicrecon/commits/${EICRECON_VERSION} /tmp/eicrecon.json -RUN --mount=type=cache,target=/ccache/,sharing=locked,id=${TARGETPLATFORM} \ - cd /tmp \ - && echo "INSTALLING EICRECON" \ - && git clone -b ${EICRECON_VERSION} --depth 1 \ - https://github.com/eic/eicrecon.git \ - && export CCACHE_DIR=/ccache \ - && cmake -B build -S eicrecon \ - -DCMAKE_CXX_FLAGS="-Wno-psabi" \ - -DCMAKE_CXX_STANDARD=17 \ - -DCMAKE_INSTALL_PREFIX=/usr/local \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - && cmake --build build -j${jobs} -- install \ - && pushd eicrecon \ - && echo " - eicrecon: ${EICRECON_VERSION}-$(git rev-parse HEAD)" \ - >> /etc/jug_info \ +## Install eicrecon to the environment +RUN spack add eicrecon@${EICRECON_VERSION} \ + && spack concretize \ + && spack install \ && echo "export JANA_PLUGIN_PATH=/usr/local/lib/EICrecon/plugins" \ - > /etc/profile.d/z12_eicrecon.sh \ - && popd \ - && rm -rf build eicrecon + > /etc/profile.d/z12_eicrecon.sh ## Install benchmarks into the container ARG BENCHMARK_COM_VERSION="master"