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
d344dad5
Commit
d344dad5
authored
1 year ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
feat: rm feature container image
parent
4269cc1a
No related branches found
No related tags found
1 merge request
!686
feat: rm feature container image
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+0
-35
0 additions, 35 deletions
.gitlab-ci.yml
containers/jug/feature.Dockerfile
+0
-21
0 additions, 21 deletions
containers/jug/feature.Dockerfile
with
0 additions
and
56 deletions
.gitlab-ci.yml
+
0
−
35
View file @
d344dad5
...
@@ -382,41 +382,6 @@ jug_xl:nightly:
...
@@ -382,41 +382,6 @@ jug_xl:nightly:
--build-context detectors=.
--build-context detectors=.
containers/jug
containers/jug
jug_xl:feature
:
extends
:
.build
stage
:
jug
rules
:
-
if
:
'
$CI_COMMIT_BRANCH
==
"master"'
when
:
on_success
-
when
:
never
needs
:
-
version
-
jug_xl:nightly
variables
:
BUILD_IMAGE
:
"
jug_xl"
parallel
:
matrix
:
-
DETECTOR
:
epic
DETECTOR_BRANCH
:
-
main
script
:
-
docker buildx build --load ${BUILD_OPTIONS}
--tag ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
--file containers/jug/feature.Dockerfile
--build-arg INTERNAL_TAG=${NIGHTLY_TAG}
--build-arg DETECTOR=${DETECTOR}
--build-arg DETECTOR_BRANCH=${DETECTOR_BRANCH}
containers/jug
-
|
PUSH_FLAG=""
if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
PUSH_FLAG="--eicweb"
fi
FEATURE_EXPORT_TAG="${VERSION}-${DETECTOR}-${DETECTOR_BRANCH}-stable"
-
./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
${FEATURE_EXPORT_TAG} ${PUSH_FLAG}
.singularity
:
.singularity
:
stage
:
deploy
stage
:
deploy
interruptible
:
true
interruptible
:
true
...
...
This diff is collapsed.
Click to expand it.
containers/jug/feature.Dockerfile
deleted
100644 → 0
+
0
−
21
View file @
4269cc1a
#syntax=docker/dockerfile:1.2
ARG
DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
ARG
INTERNAL_TAG="testing"
## Make a specific "feature" image, identical to jug_xl except for the detector
## symlinked as default in /opt/detector. Not that these images will be removed
## in the future once we move the detectors already installed in the main
## image.
FROM
${DOCKER_REGISTRY}jug_xl:${INTERNAL_TAG}
## also install detector/ip geometries into opt
ARG
DETECTOR=athena
ARG
DETECTOR_BRANCH=canyonlands
RUN
rm
-rf
/opt/detector/
{
setup.sh,lib,share
}
\
&&
ln
-sf
/opt/detector/
${
DETECTOR
}
-
${
DETECTOR_BRANCH
}
/setup.sh
\
/opt/detector/setup.sh
\
&&
ln
-sf
/opt/detector/
${
DETECTOR
}
-
${
DETECTOR_BRANCH
}
/lib
\
/opt/detector/lib
\
&&
ln
-sf
/opt/detector/
${
DETECTOR
}
-
${
DETECTOR_BRANCH
}
/share
\
/opt/detector/share
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