diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79c45e40a3bfd5e9ad8ed12f56a4e10cfb4fc056..51856014e49b04dfd4fc67449028a8d34657690a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,9 +5,8 @@ variables: JUGGLER_VERSION: "v1.6.0" NPDET_VERSION: "v0.5.0" EICD_VERSION: "v0.1.0" - DETECTOR_VERSION: "v0.1.0" - IP6_VERSION: "v0.1.0" - ACCELERATOR_VERSION: "master" #needs to be merged into IP6 + DETECTOR_VERSION: "v0.2.0" + IP6_VERSION: "v0.2.0" ## Spack github version SPACK_VERSION: "63915de99b6d4bc7c8b8a22dc45e5c3dd7ee4f26" @@ -201,7 +200,6 @@ jug_xl:default: --build-arg EICD_VERSION=${EICD_VERSION} --build-arg DETECTOR_VERSION=${DETECTOR_VERSION} --build-arg IP6_VERSION=${IP6_VERSION} - --build-arg ACCELERATOR_VERSION=${ACCELERATOR_VERSION} containers/jug - !reference [.build, script] diff --git a/containers/jug/Dockerfile.xl b/containers/jug/Dockerfile.xl index 6a6e3fa7c816fed37f3727f86f584be5b1efefba..a717ae3b03dcba0f516caa482cf98b201a98a949 100644 --- a/containers/jug/Dockerfile.xl +++ b/containers/jug/Dockerfile.xl @@ -51,12 +51,6 @@ RUN cd /tmp reference_detector/reference_detector.xml \ ${DETECTOR_DATA} \ && rm -rf build reference_detector \ - && echo "INSTALLING ACCELERATOR GEOMETRY" \ - && git clone -b ${ACCELERATOR_VERSION} \ - https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git \ - && cp -r accelerator/eic \ - ${DETECTOR_DATA} \ - && rm -rf accelerator \ && echo "INSTALLING IP6 GEOMETRY" \ && git clone -b ${IP6_VERSION} \ https://eicweb.phy.anl.gov/EIC/detectors/ip6.git \ @@ -65,4 +59,8 @@ RUN cd /tmp && cmake --build build -j12 -- install \ && cp -r ip6/ip6 \ ${DETECTOR_DATA} \ - && rm -rf build ip6 + && rm -rf build ip6 \ + && echo "ADDING SETUP SCRIPT" \ + && echo "export LD_LIBRARY_PATH=/opt/detector/lib:\$LD_LIBRARY_PATH" \ + > /opt/detector/setup.sh +