From 27ab098beabfb98d5a2ff62b08d2ea7f0841f9f7 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 23 Dec 2023 00:26:42 +0000
Subject: [PATCH] fix: get sha/id from commit json to get latest commit
---
containers/jug/dev.Dockerfile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index b47ffff10..f6761b2ff 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -20,6 +20,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM}
rm -f /etc/apt/apt.conf.d/docker-clean
apt-get -yqq update
apt-get -yqq install --no-install-recommends \
+ jq \
python3 \
python3-dev \
python3-distutils \
@@ -137,6 +138,8 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
set -e
export CCACHE_DIR=/ccache
find /var/cache/spack/blobs/sha256/ -atime +7 -delete
+JUGGLER_VERSION=$(jq -r .id /tmp/juggler.json)
+EICRECON_VERSION=$(jq -r .sha /tmp/eicrecon.json)
spack buildcache update-index eics3rw
spack env activate --dir ${SPACK_ENV}
spack add juggler@git.${JUGGLER_VERSION}
--
GitLab