diff --git a/containers/jug/xl.Dockerfile b/containers/jug/xl.Dockerfile index 9700eb44b266a95a4b3dafcd43bf8ac6f43b6733..65ff1805ecf23d6a3e3942873eb7e0cdc751b8e0 100644 --- a/containers/jug/xl.Dockerfile +++ b/containers/jug/xl.Dockerfile @@ -15,10 +15,10 @@ ARG EICD_VERSION="master" ## TODO move to spack build ARG AFTERBURNER_VERSION=main -ADD ${EICWEB}/18/repository/branches/${NPDET_VERSION} /tmp/18.json -ADD ${EICWEB}/373/repository/branches/${EICD_VERSION} /tmp/373.json -ADD ${EICWEB}/369/repository/branches/${JUGGLER_VERSION} /tmp/369.json -ADD ${EICWEB}/492/repository/branches/${AFTERBURNER_VERSION} /tmp/492.json +ADD ${EICWEB}/18/repository/tree?ref=${NPDET_VERSION} /tmp/18.json +ADD ${EICWEB}/373/repository/tree?ref=${EICD_VERSION} /tmp/373.json +ADD ${EICWEB}/369/repository/tree?ref=${JUGGLER_VERSION} /tmp/369.json +ADD ${EICWEB}/492/repository/tree?ref=${AFTERBURNER_VERSION} /tmp/492.json ## version will automatically bust cache for nightly, as it includes ## the date @@ -71,8 +71,8 @@ RUN cd /tmp ## build ARG DETECTOR_VERSION="master" ARG IP6_VERSION="master" -ADD ${EICWEB}/473/repository/branches/${DETECTOR_VERSION} /tmp/473.json -ADD ${EICWEB}/452/repository/branches/${IP6_VERSION} /tmp/452.json +ADD ${EICWEB}/473/repository/tree?ref=${DETECTOR_VERSION} /tmp/473.json +ADD ${EICWEB}/452/repository/tree?ref=${IP6_VERSION} /tmp/452.json RUN cd /tmp \ && DETECTOR_PREFIX=/opt/detector \ && DETECTOR_DATA=$DETECTOR_PREFIX/share/athena \ @@ -119,10 +119,10 @@ ARG BENCHMARK_COM_VERSION="master" ARG BENCHMARK_DET_VERSION="master" ARG BENCHMARK_REC_VERSION="master" ARG BENCHMARK_PHY_VERSION="master" -ADD ${EICWEB}/458/repository/branches/${BENCHMARK_COM_VERSION} /tmp/485.json -ADD ${EICWEB}/399/repository/branches/${BENCHMARK_DET_VERSION} /tmp/399.json -ADD ${EICWEB}/408/repository/branches/${BENCHMARK_REC_VERSION} /tmp/408.json -ADD ${EICWEB}/400/repository/branches/${BENCHMARK_PHY_VERSION} /tmp/400.json +ADD ${EICWEB}/458/repository/tree?ref=${BENCHMARK_COM_VERSION} /tmp/485.json +ADD ${EICWEB}/399/repository/tree?ref=${BENCHMARK_DET_VERSION} /tmp/399.json +ADD ${EICWEB}/408/repository/tree?ref=${BENCHMARK_REC_VERSION} /tmp/408.json +ADD ${EICWEB}/400/repository/tree?ref=${BENCHMARK_PHY_VERSION} /tmp/400.json RUN mkdir -p /opt/benchmarks \ && cd /opt/benchmarks \ @@ -144,10 +144,10 @@ ARG CAMPAIGNS_SINGLE_VERSION="main" ARG CAMPAIGNS_HEPMC3_VERSION="main" ARG CAMPAIGNS_CONDOR_VERSION="main" ARG CAMPAIGNS_SLURM_VERSION="main" -ADD ${EICWEB}/482/repository/branches/${CAMPAIGNS_SINGLE_VERSION} /tmp/482.json -ADD ${EICWEB}/483/repository/branches/${CAMPAIGNS_HEPMC3_VERSION} /tmp/483.json -ADD ${EICWEB}/484/repository/branches/${CAMPAIGNS_CONDOR_VERSION} /tmp/484.json -ADD ${EICWEB}/485/repository/branches/${CAMPAIGNS_SLURM_VERSION} /tmp/485.json +ADD ${EICWEB}/482/repository/tree?ref=${CAMPAIGNS_SINGLE_VERSION} /tmp/482.json +ADD ${EICWEB}/483/repository/tree?ref=${CAMPAIGNS_HEPMC3_VERSION} /tmp/483.json +ADD ${EICWEB}/484/repository/tree?ref=${CAMPAIGNS_CONDOR_VERSION} /tmp/484.json +ADD ${EICWEB}/485/repository/tree?ref=${CAMPAIGNS_SLURM_VERSION} /tmp/485.json RUN mkdir -p /opt/campaigns \ && cd /opt/campaigns \