fix: unset DOCKER_REGISTRY in {dev,xl}.Dockerfile

.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)

containers/jug/dev.Dockerfile

 #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"
 
 ## ========================================================================================

containers/jug/xl.Dockerfile

 #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"