From 9ad27bcc1742d13816c021626d480d7b2dfe17e4 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 9 Feb 2022 16:57:11 +0000
Subject: [PATCH] Replace eicweb registry with build-arg
---
containers/jug/dev.Dockerfile | 5 +++--
containers/jug/feature.Dockerfile | 3 ++-
containers/jug/xl.Dockerfile | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index d5bf7035f..3e5ae2432 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -1,11 +1,12 @@
#syntax=docker/dockerfile:1.2
+ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
ARG INTERNAL_TAG="testing"
## ========================================================================================
## STAGE1: spack builder image
## 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
RUN --mount=type=cache,target=/var/cache/apt \
@@ -216,7 +217,7 @@ RUN chmod a+x /usr/local/bin/mc
## STAGE 3
## 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>" \
name="jug_xl" \
diff --git a/containers/jug/feature.Dockerfile b/containers/jug/feature.Dockerfile
index 534cd93f3..8f6eceb69 100644
--- a/containers/jug/feature.Dockerfile
+++ b/containers/jug/feature.Dockerfile
@@ -1,4 +1,5 @@
#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
@@ -6,7 +7,7 @@ ARG INTERNAL_TAG="testing"
## in the future once we move the detectors already installed in the main
## 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
ARG DETECTOR=athena
diff --git a/containers/jug/xl.Dockerfile b/containers/jug/xl.Dockerfile
index 8f4948f31..511c6e892 100644
--- a/containers/jug/xl.Dockerfile
+++ b/containers/jug/xl.Dockerfile
@@ -1,11 +1,12 @@
#syntax=docker/dockerfile:1.2
+ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
ARG INTERNAL_TAG="testing"
## ========================================================================================
## STAGE1: spack builder image
## 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 JUGGLER_VERSION="master"
--
GitLab