From 091b1d14341b2092c24c01142a45ad4dfd7e3de6 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 21 May 2024 19:09:21 +0000
Subject: [PATCH] (hot)fix: deal with git.<hash>=main issues
---
containers/jug/dev.Dockerfile | 8 ++++++++
eic-spack.sh | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 222a40d08..984c6a344 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -288,6 +288,14 @@ COPY profile.d/a00_cleanup.sh /etc/profile.d
COPY profile.d/z11_jug_env.sh /etc/profile.d
COPY singularity.d /.singularity.d
+## Fixup /opt/detector/epic-git.fcf90937193c983c0af2acf1251e01f2e2c3a259_main
+RUN <<EOF
+shopt -s nullglob
+for detector in /opt/detector/epic-git.*_* ; do
+ ln -s ${detector} /opt/detector/epic-${detector/*_/}
+done
+EOF
+
## Add minio client into /usr/local/bin
ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-amd64/mc /usr/local/bin/mc-amd64
ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-arm64/mc /usr/local/bin/mc-arm64
diff --git a/eic-spack.sh b/eic-spack.sh
index 02b36574a..2c3968004 100644
--- a/eic-spack.sh
+++ b/eic-spack.sh
@@ -3,4 +3,4 @@ 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="157326983623a834661bc4bdbb9061bd256f8d1b"
+EICSPACK_VERSION="d166c4d4179b97d34774ff334635bc759d0f7931"
--
GitLab