From a651bb00596095b835d811ed8c96383edadf4d4e Mon Sep 17 00:00:00 2001
From: Max Whitehead <max.blackllama.alt3@gmail.com>
Date: Wed, 2 Apr 2025 09:20:43 -0700
Subject: [PATCH] Auth and switch to gitlab.com registry instead of dockerhub.
---
.gitlab-ci.yml | 2 +-
build_containers.sh | 4 ++--
build_head_containers.sh | 4 ++--
build_nightly.sh | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9582664e..5e2dfc97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,7 +77,7 @@ stages:
- ln -s buildah /usr/bin/docker
- dnf install -y --nodocs git
- git config --global --add safe.directory $(pwd)
- - echo "${DOCKER_HUB_PASSWORD}" | buildah login -u "${DOCKER_HUB_USER}" --password-stdin docker.io
+ - echo "${REGISTRY_PASSWORD}" | buildah login -u "${REGISTRY_USERNAME}" --password-stdin registry.gitlab.com
- |
if [ "$CI_PIPELINE_SOURCE" == "schedule" ]; then
echo 'Running nightly build script'
diff --git a/build_containers.sh b/build_containers.sh
index 0e57327c..602cd93e 100755
--- a/build_containers.sh
+++ b/build_containers.sh
@@ -15,10 +15,10 @@ if [[ ! -z "${DOCKERFILES-}" ]]; then
for DOCKERFILE in "${DOCKERFILES[@]}"
do
DOCKERTAG=$(echo ${DOCKERFILE} | awk 'BEGIN {FS="/";} {print $1"-"$2}')
- docker build -t drupalci/${DOCKERTAG#db-}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
+ docker build -t ${REGISTRY_PATH}/${DOCKERTAG#db-}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
BUILDRESULT=$?
if [ ${BUILDRESULT} -eq 0 ]; then
- docker push drupalci/${DOCKERTAG#db-}:${GITBRANCH}
+ docker push ${REGISTRY_PATH}/${DOCKERTAG#db-}:${GITBRANCH}
#TODO: this currently assumes that the only containers we are working on are the php containers.
# Legacy from when this was a Jenkins script
#if [ "${GITBRANCH}" != "production" ]; then
diff --git a/build_head_containers.sh b/build_head_containers.sh
index ec7dd716..27f624e0 100755
--- a/build_head_containers.sh
+++ b/build_head_containers.sh
@@ -17,10 +17,10 @@ if [[ ! -z "${DOCKERFILES-}" ]]; then
for DOCKERFILE in "${DOCKERFILES[@]}"
do
DOCKERTAG=$(echo ${DOCKERFILE} | awk 'BEGIN {FS="/";} {print $1"-"$2}')
- docker build --no-cache -t drupalci/${DOCKERTAG}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
+ docker build --no-cache -t ${REGISTRY_PATH}/${DOCKERTAG}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
BUILDRESULT=$?
if [ ${BUILDRESULT} -eq 0 ]; then
- docker push drupalci/${DOCKERTAG}:${GITBRANCH}
+ docker push ${REGISTRY_PATH}/${DOCKERTAG}:${GITBRANCH}
fi
done
fi
diff --git a/build_nightly.sh b/build_nightly.sh
index 347a57fb..c7ba3787 100755
--- a/build_nightly.sh
+++ b/build_nightly.sh
@@ -13,10 +13,10 @@ if [[ ! -z "${DOCKERFILES-}" ]]; then
for DOCKERFILE in "${DOCKERFILES[@]}"
do
DOCKERTAG=$(echo ${DOCKERFILE} | awk 'BEGIN {FS="/";} {print $1"-"$2}')
- docker build -t drupalci/${DOCKERTAG#db-}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
+ docker build -t ${REGISTRY_PATH}/${DOCKERTAG#db-}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
BUILDRESULT=$?
if [ ${BUILDRESULT} -eq 0 ]; then
- docker push drupalci/${DOCKERTAG#db-}:${GITBRANCH}
+ docker push ${REGISTRY_PATH}/${DOCKERTAG#db-}:${GITBRANCH}
fi
done
fi
--
GitLab