Skip to content
Snippets Groups Projects
Commit 77105f25 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

use updated upstream container

parent c2b7e1ca
No related branches found
No related tags found
2 merge requests!13Merge new version from staging into master,!12New container
# Builder with Argonne EIC software # Builder with Argonne EIC software
# #
FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:snapshot-20200922 FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:snapshot-20201025
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=20200908-testing \ DOCKERFILE_DISTRO_VERSION=20201012-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 \
......
...@@ -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-20200908 FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_minimal:testing-20201012
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=20200908-testing \ DOCKERFILE_DISTRO_VERSION=20201012-testing \
DEBIAN_FRONTEND=noninteractive \ DEBIAN_FRONTEND=noninteractive \
@ENV@ @ENV@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment