From 0411585797c494944e28e66367c9f51bc63605f6 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Fri, 16 Jun 2023 01:04:53 +0000
Subject: [PATCH] fix: unset DOCKER_REGISTRY in {dev,xl}.Dockerfile
---
.gitlab-ci.yml | 19 +++++++++++--------
containers/jug/dev.Dockerfile | 4 ++--
containers/jug/xl.Dockerfile | 2 +-
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1133d9a02..674559c23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -329,16 +329,17 @@ jug_dev:default:
}
--file containers/jug/dev.Dockerfile
--platform ${PLATFORM}
- --build-arg BASE_IMAGE="${BASE_IMAGE}"
- --build-arg SPACK_ORGREPO="${SPACK_ORGREPO}"
- --build-arg SPACK_VERSION="${SPACK_VERSION}"
+ --build-arg DOCKER_REGISTRY=${CI_REGISTRY}/${CI_PROJECT_PATH}/
+ --build-arg BASE_IMAGE=${BASE_IMAGE}
+ --build-arg INTERNAL_TAG=${INTERNAL_TAG}
+ --build-arg SPACK_ORGREPO=${SPACK_ORGREPO}
+ --build-arg SPACK_VERSION=${SPACK_VERSION}
--build-arg SPACK_CHERRYPICKS="${SPACK_CHERRYPICKS}"
- --build-arg EICSPACK_ORGREPO="${EICSPACK_ORGREPO}"
- --build-arg EICSPACK_VERSION="${EICSPACK_VERSION}"
+ --build-arg EICSPACK_ORGREPO=${EICSPACK_ORGREPO}
+ --build-arg EICSPACK_VERSION=${EICSPACK_VERSION}
--build-arg EICSPACK_CHERRYPICKS="${EICSPACK_CHERRYPICKS}"
- --build-arg S3_ACCESS_KEY="${S3_ACCESS_KEY}"
- --build-arg S3_SECRET_KEY="${S3_SECRET_KEY}"
- --build-arg INTERNAL_TAG=${INTERNAL_TAG}
+ --build-arg S3_ACCESS_KEY=${S3_ACCESS_KEY}
+ --build-arg S3_SECRET_KEY=${S3_SECRET_KEY}
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
--build-arg jobs=${JOBS}
--build-context spack=.
@@ -370,6 +371,7 @@ jug_xl:default:
}
--file containers/jug/xl.Dockerfile
--platform ${PLATFORM}
+ --build-arg DOCKER_REGISTRY=${CI_REGISTRY}/${CI_PROJECT_PATH}/
--build-arg BASE_IMAGE=${BASE_IMAGE}
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg JUGGLER_VERSION=${JUGGLER_VERSION}
@@ -418,6 +420,7 @@ jug_xl:nightly:
}
--file containers/jug/xl.Dockerfile
--platform ${PLATFORM}
+ --build-arg DOCKER_REGISTRY=${CI_REGISTRY}/${CI_PROJECT_PATH}/
--build-arg BASE_IMAGE=${BASE_IMAGE}
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg JUG_VERSION=nightly-$(date +%Y-%m-%d_%H-%M-%S)-${INTERNAL_TAG}-$(git rev-parse HEAD)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index ceb437ec0..46272a675 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -1,6 +1,6 @@
#syntax=docker/dockerfile:1.4
-ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
-ARG BASE_IMAGE="debian_base"
+ARG DOCKER_REGISTRY="eicweb"
+ARG BASE_IMAGE="debian_testing_base"
ARG INTERNAL_TAG="testing"
## ========================================================================================
diff --git a/containers/jug/xl.Dockerfile b/containers/jug/xl.Dockerfile
index 86513df12..31a0b7c75 100644
--- a/containers/jug/xl.Dockerfile
+++ b/containers/jug/xl.Dockerfile
@@ -1,5 +1,5 @@
#syntax=docker/dockerfile:1.4
-ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
+ARG DOCKER_REGISTRY="eicweb/"
ARG BASE_IMAGE="jug_dev"
ARG INTERNAL_TAG="testing"
--
GitLab