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
9ad27bcc
Commit
9ad27bcc
authored
3 years ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
Replace eicweb registry with build-arg
parent
c87ea799
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!264
Replace eicweb registry with build-arg
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
containers/jug/dev.Dockerfile
+3
-2
3 additions, 2 deletions
containers/jug/dev.Dockerfile
containers/jug/feature.Dockerfile
+2
-1
2 additions, 1 deletion
containers/jug/feature.Dockerfile
containers/jug/xl.Dockerfile
+2
-1
2 additions, 1 deletion
containers/jug/xl.Dockerfile
with
7 additions
and
4 deletions
containers/jug/dev.Dockerfile
+
3
−
2
View file @
9ad27bcc
#syntax=docker/dockerfile:1.2
#syntax=docker/dockerfile:1.2
ARG
DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
ARG
INTERNAL_TAG="testing"
ARG
INTERNAL_TAG="testing"
## ========================================================================================
## ========================================================================================
## STAGE1: spack builder image
## STAGE1: spack builder image
## EIC builder image with spack
## EIC builder image with spack
## ========================================================================================
## ========================================================================================
FROM
eicweb.phy.anl.gov:4567/containers/eic_container/
debian_base:${INTERNAL_TAG}
as
builder
FROM
${DOCKER_REGISTRY}
debian_base:${INTERNAL_TAG}
as
builder
## instal some extra spack dependencies
## instal some extra spack dependencies
RUN
--mount
=
type
=
cache,target
=
/var/cache/apt
\
RUN
--mount
=
type
=
cache,target
=
/var/cache/apt
\
...
@@ -216,7 +217,7 @@ RUN chmod a+x /usr/local/bin/mc
...
@@ -216,7 +217,7 @@ RUN chmod a+x /usr/local/bin/mc
## STAGE 3
## STAGE 3
## Lean target image
## Lean target image
## ========================================================================================
## ========================================================================================
FROM
eicweb.phy.anl.gov:4567/containers/eic_container/
debian_base:${INTERNAL_TAG}
FROM
${DOCKER_REGISTRY}
debian_base:${INTERNAL_TAG}
LABEL
maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
LABEL
maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
name="jug_xl" \
name="jug_xl" \
...
...
This diff is collapsed.
Click to expand it.
containers/jug/feature.Dockerfile
+
2
−
1
View file @
9ad27bcc
#syntax=docker/dockerfile:1.2
#syntax=docker/dockerfile:1.2
ARG
DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
ARG
INTERNAL_TAG="testing"
ARG
INTERNAL_TAG="testing"
## Make a specific "feature" image, identical to jug_xl except for the detector
## Make a specific "feature" image, identical to jug_xl except for the detector
...
@@ -6,7 +7,7 @@ ARG INTERNAL_TAG="testing"
...
@@ -6,7 +7,7 @@ ARG INTERNAL_TAG="testing"
## in the future once we move the detectors already installed in the main
## in the future once we move the detectors already installed in the main
## image.
## image.
FROM
eicweb.phy.anl.gov:4567/containers/eic_container/
jug_xl:${INTERNAL_TAG}
FROM
{DOCKER_REGISTRY}
jug_xl:${INTERNAL_TAG}
## also install detector/ip geometries into opt
## also install detector/ip geometries into opt
ARG
DETECTOR=athena
ARG
DETECTOR=athena
...
...
This diff is collapsed.
Click to expand it.
containers/jug/xl.Dockerfile
+
2
−
1
View file @
9ad27bcc
#syntax=docker/dockerfile:1.2
#syntax=docker/dockerfile:1.2
ARG
DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
ARG
INTERNAL_TAG="testing"
ARG
INTERNAL_TAG="testing"
## ========================================================================================
## ========================================================================================
## STAGE1: spack builder image
## STAGE1: spack builder image
## EIC builder image with spack
## EIC builder image with spack
## ========================================================================================
## ========================================================================================
FROM
eicweb.phy.anl.gov:4567/containers/eic_container/
jug_dev:${INTERNAL_TAG}
FROM
${DOCKER_REGISTRY}
jug_dev:${INTERNAL_TAG}
ARG
EICWEB="https://eicweb.phy.anl.gov/api/v4/projects"
ARG
EICWEB="https://eicweb.phy.anl.gov/api/v4/projects"
ARG
JUGGLER_VERSION="master"
ARG
JUGGLER_VERSION="master"
...
...
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