commit 77aa8caabd9d671d4203e64ea41e6ff9a8731891
author Saheer Babu <saheer.babu@arm.com> Fri Aug 15 17:42:23 2025 +0100
committer Saheer Babu <saheer.babu@arm.com> Fri Aug 15 17:42:23 2025 +0100
tree 44fb7f9d511839c4315cd63e7d5dbf124dfa006a
parent 793e014e34989ef5b1d1d9468468edafa32bd0e1

Begin: Update publishing script

Change-Id: I1ea23b4f9f7bddff9feeefc0902c86465d6bc911
Signed-off-by: Saheer Babu <saheer.babu@arm.com>

ci-dockerfiles-deployment/publish.sh

diff --git a/ci-dockerfiles-deployment/publish.sh b/ci-dockerfiles-deployment/publish.sh
index 2551872..a41ea72 100755
--- a/ci-dockerfiles-deployment/publish.sh
+++ b/ci-dockerfiles-deployment/publish.sh
@@ -10,7 +10,7 @@
     rm -f ${WORKSPACE}/{log,config.json,version.txt}
 }
 
-docker_log_in()
+dh_registry_log_in()
 {
     mkdir -p ${HOME}/.docker
     cat > ${HOME}/.docker/config.json << EOF
@@ -26,13 +26,13 @@
 }
 export AWS_DEFAULT_REGION=eu-west-1
 update_images=$(find -type f -name .docker-tag)
-docker_log_in
+dh_registry_log_in
 for imagename in ${update_images}; do
   (
     docker_tag=$(cat $imagename)
     if [ x"${GERRIT_BRANCH}" != x"master" ]; then
       new_tag=${docker_tag}-${GERRIT_BRANCH}
-      docker tag ${docker_tag} ${new_tag}
+      buildah tag ${docker_tag} ${new_tag}
       docker_tag=${new_tag}
     fi
 
@@ -41,14 +41,14 @@
         # The following code pushes docker images to both DockerHub and PRIVATE_CONTAINER_REGISTRY
         # PRIVATE_CONTAINER_REGISTRY is used to overcome the DockerHub rate limiting
         mirror_tag=${PRIVATE_CONTAINER_REGISTRY}/${docker_tag}
-        docker tag ${docker_tag} ${mirror_tag}
-        aws ecr get-login-password | docker login --username AWS --password-stdin ${PRIVATE_CONTAINER_REGISTRY}
+        buildah tag ${docker_tag} ${mirror_tag}
+        aws ecr get-login-password | buildah login --username AWS --password-stdin ${PRIVATE_CONTAINER_REGISTRY}
         REPO_NAME=$(echo "$docker_tag" | cut -d: -f1)
         # create if repository not already present in PRIVATE_CONTAINER_REGISTRY
         aws ecr describe-repositories --repository-names ${REPO_NAME} || aws ecr create-repository --repository-name ${REPO_NAME}
-        docker push ${docker_tag} && docker push ${mirror_tag} && exit 0 || true
+        buildah push ${docker_tag} && buildah push ${mirror_tag} && exit 0 || true
         sleep $i
-        docker_log_in
+        dh_registry_log_in
     done
     exit 1
   )||echo $imagename push failed >> ${WORKSPACE}/log