From 7d2c9265e6734dc6a2d20e969a8c844924471cb1 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 12 Aug 2023 23:02:00 +0000
Subject: [PATCH] fix: add juggler and EICrecon in jug_dev
---
containers/jug/dev.Dockerfile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 0b2ab6b72..f81105eb3 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -104,6 +104,8 @@ FROM spack as builder
## Setup our custom environment (secret mount for write-enabled mirror)
COPY --from=spack-environment . /opt/spack-environment/
ARG ENV=dev
+ARG JUGGLER_VERSION="main"
+ARG EICRECON_VERSION="main"
ENV SPACK_ENV=/opt/spack-environment/${ENV}
RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
--mount=type=cache,target=/var/cache/spack \
@@ -111,6 +113,8 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
source $SPACK_ROOT/share/spack/setup-env.sh \
&& export CCACHE_DIR=/ccache \
&& spack env activate --dir ${SPACK_ENV} \
+ && spack add juggler@git.${JUGGLER_VERSION} \
+ && spack add eicrecon@git.${EICRECON_VERSION} \
&& make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
SPACK_ENV=${SPACK_ENV} \
BUILDCACHE_MIRROR="local eics3rw" \
--
GitLab