From 77105f250ef800adc6a84733b45665434bcf6b87 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Mon, 26 Oct 2020 03:37:20 +0000
Subject: [PATCH] use updated upstream container
---
containers/builder/Dockerfile | 4 ++--
containers/release/Dockerfile.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/containers/builder/Dockerfile b/containers/builder/Dockerfile
index b225b4353..e80801e4e 100644
--- a/containers/builder/Dockerfile
+++ b/containers/builder/Dockerfile
@@ -1,6 +1,6 @@
# 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>" \
name="eic_builder" \
@@ -11,7 +11,7 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
ENV DOCKERFILE_BASE=debian \
DOCKERFILE_DISTRO=debian \
- DOCKERFILE_DISTRO_VERSION=20200908-testing \
+ DOCKERFILE_DISTRO_VERSION=20201012-testing \
SPACK_ROOT=/opt/spack \
DEBIAN_FRONTEND=noninteractive \
CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
diff --git a/containers/release/Dockerfile.in b/containers/release/Dockerfile.in
index 7d49e3278..ce3549aec 100644
--- a/containers/release/Dockerfile.in
+++ b/containers/release/Dockerfile.in
@@ -11,7 +11,7 @@ RUN find -L /usr/local/* -type f -exec readlink -f '{}' \; | \
grep 'x-executable\|x-archive\|x-sharedlib' | \
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>" \
name="eic" \
group="eic" \
@@ -22,7 +22,7 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
## @ENV@ will be automatically expanded to auto-load the
## runtime environment
ENV DOCKERFILE_DISTRO=ubuntu \
- DOCKERFILE_DISTRO_VERSION=20200908-testing \
+ DOCKERFILE_DISTRO_VERSION=20201012-testing \
DEBIAN_FRONTEND=noninteractive \
@ENV@
--
GitLab