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
77105f25
Commit
77105f25
authored
4 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
use updated upstream container
parent
c2b7e1ca
No related branches found
No related tags found
2 merge requests
!13
Merge new version from staging into master
,
!12
New container
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
containers/builder/Dockerfile
+2
-2
2 additions, 2 deletions
containers/builder/Dockerfile
containers/release/Dockerfile.in
+2
-2
2 additions, 2 deletions
containers/release/Dockerfile.in
with
4 additions
and
4 deletions
containers/builder/Dockerfile
+
2
−
2
View file @
77105f25
# Builder with Argonne EIC software
# Builder with Argonne EIC software
#
#
FROM
eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:snapshot-2020
0922
FROM
eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:snapshot-2020
1025
LABEL
maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
LABEL
maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
name="eic_builder" \
name="eic_builder" \
...
@@ -11,7 +11,7 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
...
@@ -11,7 +11,7 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
ENV
DOCKERFILE_BASE=debian \
ENV
DOCKERFILE_BASE=debian \
DOCKERFILE_DISTRO=debian \
DOCKERFILE_DISTRO=debian \
DOCKERFILE_DISTRO_VERSION=2020
0908
-testing \
DOCKERFILE_DISTRO_VERSION=2020
1012
-testing \
SPACK_ROOT=/opt/spack \
SPACK_ROOT=/opt/spack \
DEBIAN_FRONTEND=noninteractive \
DEBIAN_FRONTEND=noninteractive \
CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
...
...
This diff is collapsed.
Click to expand it.
containers/release/Dockerfile.in
+
2
−
2
View file @
77105f25
...
@@ -11,7 +11,7 @@ RUN find -L /usr/local/* -type f -exec readlink -f '{}' \; | \
...
@@ -11,7 +11,7 @@ RUN find -L /usr/local/* -type f -exec readlink -f '{}' \; | \
grep 'x-executable\|x-archive\|x-sharedlib' | \
grep 'x-executable\|x-archive\|x-sharedlib' | \
awk -F: '{print $1}' | xargs strip -s
awk -F: '{print $1}' | xargs strip -s
FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_minimal:testing-2020
0908
FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_minimal:testing-2020
1012
LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
name="eic" \
name="eic" \
group="eic" \
group="eic" \
...
@@ -22,7 +22,7 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
...
@@ -22,7 +22,7 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
## @ENV@ will be automatically expanded to auto-load the
## @ENV@ will be automatically expanded to auto-load the
## runtime environment
## runtime environment
ENV DOCKERFILE_DISTRO=ubuntu \
ENV DOCKERFILE_DISTRO=ubuntu \
DOCKERFILE_DISTRO_VERSION=2020
0908
-testing \
DOCKERFILE_DISTRO_VERSION=2020
1012
-testing \
DEBIAN_FRONTEND=noninteractive \
DEBIAN_FRONTEND=noninteractive \
@ENV@
@ENV@
...
...
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