Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eic_container
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
containers
eic_container
Commits
3a322cb4
Commit
3a322cb4
authored
3 years ago
by
Wouter Deconinck
Committed by
Sylvester Joosten
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
No hard --no-cache, but bust cache with gitlab api call
(cherry picked from commit
282eb09f
)
parent
f55aef24
Branches
Branches containing commit
No related tags found
1 merge request
!201
Add awkward-array package
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+0
-2
0 additions, 2 deletions
.gitlab-ci.yml
containers/jug/xl.Dockerfile
+16
-0
16 additions, 0 deletions
containers/jug/xl.Dockerfile
with
16 additions
and
2 deletions
.gitlab-ci.yml
+
0
−
2
View file @
3a322cb4
...
@@ -245,7 +245,6 @@ jug_xl:default:
...
@@ -245,7 +245,6 @@ jug_xl:default:
--build-arg DETECTOR_VERSION=${DETECTOR_VERSION}
--build-arg DETECTOR_VERSION=${DETECTOR_VERSION}
--build-arg IP6_VERSION=${IP6_VERSION}
--build-arg IP6_VERSION=${IP6_VERSION}
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
--no-cache
containers/jug
containers/jug
-
!reference
[
.build
,
script
]
-
!reference
[
.build
,
script
]
...
@@ -268,7 +267,6 @@ jug_xl:nightly:
...
@@ -268,7 +267,6 @@ jug_xl:nightly:
-f containers/jug/xl.Dockerfile
-f containers/jug/xl.Dockerfile
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg JUG_VERSION=nightly-$(date +%Y-%m-%d_%H-%M-%S)-${INTERNAL_TAG}-$(git rev-parse HEAD)
--build-arg JUG_VERSION=nightly-$(date +%Y-%m-%d_%H-%M-%S)-${INTERNAL_TAG}-$(git rev-parse HEAD)
--no-cache
containers/jug
containers/jug
-
|
-
|
PUSH_FLAG=""
PUSH_FLAG=""
...
...
This diff is collapsed.
Click to expand it.
containers/jug/xl.Dockerfile
+
16
−
0
View file @
3a322cb4
...
@@ -7,6 +7,7 @@ ARG INTERNAL_TAG="testing"
...
@@ -7,6 +7,7 @@ ARG INTERNAL_TAG="testing"
## ========================================================================================
## ========================================================================================
FROM
eicweb.phy.anl.gov:4567/containers/eic_container/jug_dev:${INTERNAL_TAG}
FROM
eicweb.phy.anl.gov:4567/containers/eic_container/jug_dev:${INTERNAL_TAG}
ARG
EICWEB="https://eicweb.phy.anl.gov/api/v4/projects"
ARG
JUGGLER_VERSION="master"
ARG
JUGGLER_VERSION="master"
ARG
NPDET_VERSION="master"
ARG
NPDET_VERSION="master"
ARG
EICD_VERSION="master"
ARG
EICD_VERSION="master"
...
@@ -14,6 +15,11 @@ ARG EICD_VERSION="master"
...
@@ -14,6 +15,11 @@ ARG EICD_VERSION="master"
## TODO move to spack build
## TODO move to spack build
ARG
AFTERBURNER_VERSION=main
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
## version will automatically bust cache for nightly, as it includes
## version will automatically bust cache for nightly, as it includes
## the date
## the date
ARG
JUG_VERSION=1
ARG
JUG_VERSION=1
...
@@ -65,6 +71,8 @@ RUN cd /tmp
...
@@ -65,6 +71,8 @@ RUN cd /tmp
## build
## build
ARG
DETECTOR_VERSION="master"
ARG
DETECTOR_VERSION="master"
ARG
IP6_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
RUN
cd
/tmp
\
RUN
cd
/tmp
\
&&
DETECTOR_PREFIX
=
/opt/detector
\
&&
DETECTOR_PREFIX
=
/opt/detector
\
&&
DETECTOR_DATA
=
$DETECTOR_PREFIX
/share/athena
\
&&
DETECTOR_DATA
=
$DETECTOR_PREFIX
/share/athena
\
...
@@ -111,6 +119,10 @@ ARG BENCHMARK_COM_VERSION="master"
...
@@ -111,6 +119,10 @@ ARG BENCHMARK_COM_VERSION="master"
ARG
BENCHMARK_DET_VERSION="master"
ARG
BENCHMARK_DET_VERSION="master"
ARG
BENCHMARK_REC_VERSION="master"
ARG
BENCHMARK_REC_VERSION="master"
ARG
BENCHMARK_PHY_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
RUN
mkdir
-p
/opt/benchmarks
\
RUN
mkdir
-p
/opt/benchmarks
\
&&
cd
/opt/benchmarks
\
&&
cd
/opt/benchmarks
\
...
@@ -132,6 +144,10 @@ ARG CAMPAIGNS_SINGLE_VERSION="main"
...
@@ -132,6 +144,10 @@ ARG CAMPAIGNS_SINGLE_VERSION="main"
ARG
CAMPAIGNS_HEPMC3_VERSION="main"
ARG
CAMPAIGNS_HEPMC3_VERSION="main"
ARG
CAMPAIGNS_CONDOR_VERSION="main"
ARG
CAMPAIGNS_CONDOR_VERSION="main"
ARG
CAMPAIGNS_SLURM_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
RUN
mkdir
-p
/opt/campaigns
\
RUN
mkdir
-p
/opt/campaigns
\
&&
cd
/opt/campaigns
\
&&
cd
/opt/campaigns
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment