diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile index f070d451533a76bf522ebc45f4db497e8733e55a..e8b2a86bbf9ae8c8f1a87a186ee1595a7ae3bcf5 100644 --- a/containers/jug/dev.Dockerfile +++ b/containers/jug/dev.Dockerfile @@ -252,6 +252,66 @@ ARG JUG_VERSION=1 RUN echo "" >> /etc/jug_info \ && echo " - jug_dev: ${JUG_VERSION}" >> /etc/jug_info +## eicweb shortcut +ARG EICWEB="https://eicweb.phy.anl.gov/api/v4/projects" + +## Install benchmarks into the container +ARG BENCHMARK_COM_VERSION="master" +ARG BENCHMARK_DET_VERSION="master" +ARG BENCHMARK_REC_VERSION="master" +ARG BENCHMARK_PHY_VERSION="master" +## cache bust when updated repositories +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 \ + && git clone -b ${BENCHMARK_COM_VERSION} --depth 1 \ + https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git \ + && mkdir -p /opt/benchmarks \ + && cd /opt/benchmarks \ + && git clone -b ${BENCHMARK_DET_VERSION} --depth 1 \ + https://eicweb.phy.anl.gov/EIC/benchmarks/detector_benchmarks.git \ + && ln -sf ../common_bench detector_benchmarks/.local \ + && mkdir -p /opt/benchmarks \ + && cd /opt/benchmarks \ + && git clone -b ${BENCHMARK_REC_VERSION} --depth 1 \ + https://eicweb.phy.anl.gov/EIC/benchmarks/reconstruction_benchmarks.git \ + && ln -sf ../common_bench reconstruction_benchmarks/.local \ + && mkdir -p /opt/benchmarks \ + && cd /opt/benchmarks \ + && git clone -b ${BENCHMARK_PHY_VERSION} --depth 1 \ + https://eicweb.phy.anl.gov/EIC/benchmarks/physics_benchmarks.git \ + && ln -sf ../common_bench physics_benchmarks/.local + +## Install campaigns into the container +ARG CAMPAIGNS_SINGLE_VERSION="main" +ARG CAMPAIGNS_HEPMC3_VERSION="main" +ARG CAMPAIGNS_CONDOR_VERSION="main" +ARG CAMPAIGNS_SLURM_VERSION="main" +## cache bust when updated repositories +ADD https://api.github.com/repos/eic/simulation_campaign_single/commits/${CAMPAIGNS_SINGLE_VERSION} /tmp/simulation_campaign_single.json +ADD https://api.github.com/repos/eic/simulation_campaign_hepmc3/commits/${CAMPAIGNS_HEPMC3_VERSION} /tmp/simulation_campaign_hepmc3.json +ADD https://api.github.com/repos/eic/job_submission_condor/commits/${CAMPAIGNS_CONDOR_VERSION} /tmp/job_submission_condor.json +ADD https://api.github.com/repos/eic/job_submission_slurm/commits/${CAMPAIGNS_SLURM_VERSION} /tmp/job_submission_slurm.json +RUN mkdir -p /opt/campaigns \ + && cd /opt/campaigns \ + && git clone -b ${CAMPAIGNS_SINGLE_VERSION} --depth 1 \ + https://github.com/eic/simulation_campaign_single.git single \ + && mkdir -p /opt/campaigns \ + && cd /opt/campaigns \ + && git clone -b ${CAMPAIGNS_HEPMC3_VERSION} --depth 1 \ + https://github.com/eic/simulation_campaign_hepmc3.git hepmc3 \ + && mkdir -p /opt/campaigns \ + && cd /opt/campaigns \ + && git clone -b ${CAMPAIGNS_CONDOR_VERSION} --depth 1 \ + https://github.com/eic/job_submission_condor.git condor \ + && mkdir -p /opt/campaigns \ + && cd /opt/campaigns \ + && git clone -b ${CAMPAIGNS_SLURM_VERSION} --depth 1 \ + https://github.com/eic/job_submission_slurm.git slurm + ## make sure we have the entrypoints setup correctly ENTRYPOINT ["/usr/local/sbin/entrypoint.sh"] CMD ["bash", "--rcfile", "/etc/profile", "-l"] diff --git a/containers/jug/xl.Dockerfile b/containers/jug/xl.Dockerfile index ff5d2c9a38d619224e2839fa7e354e3c61d742b5..38064fc3f4089af26d3389e4996503d7fea33546 100644 --- a/containers/jug/xl.Dockerfile +++ b/containers/jug/xl.Dockerfile @@ -64,62 +64,6 @@ RUN --mount=type=cache,target=/ccache/,sharing=locked,id=${TARGETPLATFORM} && popd \ && rm -rf build eicrecon -## Install benchmarks into the container -ARG BENCHMARK_COM_VERSION="master" -ARG BENCHMARK_DET_VERSION="master" -ARG BENCHMARK_REC_VERSION="master" -ARG BENCHMARK_PHY_VERSION="master" -## cache bust when updated repositories -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 \ - && git clone -b ${BENCHMARK_COM_VERSION} --depth 1 \ - https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git \ - && mkdir -p /opt/benchmarks \ - && cd /opt/benchmarks \ - && git clone -b ${BENCHMARK_DET_VERSION} --depth 1 \ - https://eicweb.phy.anl.gov/EIC/benchmarks/detector_benchmarks.git \ - && ln -sf ../common_bench detector_benchmarks/.local \ - && mkdir -p /opt/benchmarks \ - && cd /opt/benchmarks \ - && git clone -b ${BENCHMARK_REC_VERSION} --depth 1 \ - https://eicweb.phy.anl.gov/EIC/benchmarks/reconstruction_benchmarks.git \ - && ln -sf ../common_bench reconstruction_benchmarks/.local \ - && mkdir -p /opt/benchmarks \ - && cd /opt/benchmarks \ - && git clone -b ${BENCHMARK_PHY_VERSION} --depth 1 \ - https://eicweb.phy.anl.gov/EIC/benchmarks/physics_benchmarks.git \ - && ln -sf ../common_bench physics_benchmarks/.local - -## Install campaigns into the container -ARG CAMPAIGNS_SINGLE_VERSION="main" -ARG CAMPAIGNS_HEPMC3_VERSION="main" -ARG CAMPAIGNS_CONDOR_VERSION="main" -ARG CAMPAIGNS_SLURM_VERSION="main" -## cache bust when updated repositories -ADD https://api.github.com/repos/eic/simulation_campaign_single/commits/${CAMPAIGNS_SINGLE_VERSION} /tmp/simulation_campaign_single.json -ADD https://api.github.com/repos/eic/simulation_campaign_hepmc3/commits/${CAMPAIGNS_HEPMC3_VERSION} /tmp/simulation_campaign_hepmc3.json -ADD https://api.github.com/repos/eic/job_submission_condor/commits/${CAMPAIGNS_CONDOR_VERSION} /tmp/job_submission_condor.json -ADD https://api.github.com/repos/eic/job_submission_slurm/commits/${CAMPAIGNS_SLURM_VERSION} /tmp/job_submission_slurm.json -RUN mkdir -p /opt/campaigns \ - && cd /opt/campaigns \ - && git clone -b ${CAMPAIGNS_SINGLE_VERSION} --depth 1 \ - https://github.com/eic/simulation_campaign_single.git single \ - && mkdir -p /opt/campaigns \ - && cd /opt/campaigns \ - && git clone -b ${CAMPAIGNS_HEPMC3_VERSION} --depth 1 \ - https://github.com/eic/simulation_campaign_hepmc3.git hepmc3 \ - && mkdir -p /opt/campaigns \ - && cd /opt/campaigns \ - && git clone -b ${CAMPAIGNS_CONDOR_VERSION} --depth 1 \ - https://github.com/eic/job_submission_condor.git condor \ - && mkdir -p /opt/campaigns \ - && cd /opt/campaigns \ - && git clone -b ${CAMPAIGNS_SLURM_VERSION} --depth 1 \ - https://github.com/eic/job_submission_slurm.git slurm ## also install detector/ip geometries into opt ARG NIGHTLY='' ## cache bust when updated repositories