From 735e05aa7dc1e3f8be524aac1161b345761778f3 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Fri, 3 Nov 2023 15:06:53 +0000
Subject: [PATCH] fix: reconcretize in stage 2
---
containers/jug/dev.Dockerfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 38edc89f5..7f765b289 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -128,7 +128,7 @@ EOF
## ========================================================================================
FROM spack as builder
-## Setup our custom environment (secret mount for write-enabled mirror)
+## 1. Setup our default environment (secret mount for write-enabled mirror)
COPY --from=spack-environment . /opt/spack-environment/
ARG ENV=dev
ENV SPACK_ENV=/opt/spack-environment/${ENV}
@@ -146,7 +146,7 @@ ccache --show-stats
ccache --zero-stats
EOF
-## Setup our custom environment with custom versions (on top of cached layer)
+## 2. Setup our environment with custom versions (on top of cached layer)
ARG JUGGLER_VERSION=""
ARG EICRECON_VERSION=""
ADD https://eicweb.phy.anl.gov/api/v4/projects/EIC%2Fjuggler/repository/tree?ref=${JUGGLER_VERSION} /tmp/juggler.json
@@ -166,6 +166,7 @@ fi
if [ -n ${EICRECON_VERSION} ] ; then
spack rm eicrecon && spack add eicrecon@git.${EICRECON_VERSION}
fi
+spack concretize --force --fresh
make --jobs ${jobs} --keep-going --directory /opt/spack-environment SPACK_ENV=${SPACK_ENV} BUILDCACHE_MIRROR="local eics3rw"
ccache --show-stats
ccache --zero-stats
--
GitLab