Do not push tagged images to Gitlab registry

container/build.yaml

@@ -19,10 +19,11 @@ include:
     - |
       if [[ -n "${CI_COMMIT_TAG}" ]]; then
         DOCKER_HUB_OPTIONS="--destination=${DOCKER_HUB_DESTINATION}:${CI_APPLICATION_TAG}-${ARCH} --destination=${DOCKER_HUB_DESTINATION}:latest-${ARCH}"
+      else
+        DOCKER_HUB_OPTIONS="--destination=${CI_IMAGE}-${ARCH}""
       fi
       /kaniko/executor --context ${CI_PROJECT_DIR}/${IMAGE_PATH} \
         --dockerfile Dockerfile \
-        --destination ${CI_IMAGE}-${ARCH} \
         ${DOCKER_HUB_OPTIONS} \
         --digest-file=/dev/termination-log \
         --image-name-with-digest-file=image-digest-${ARCH}.txt \
@@ -57,13 +58,15 @@ include:
     - mkdir -p ${HOME}/.docker
     - mv /kaniko/.docker/config.json ${HOME}/.docker/config.json
     - |
-      DIGEST=$(manifest-tool push from-args \
-        --platforms linux/amd64,linux/arm64 \
-        --template ${CI_IMAGE}-ARCH \
-        --target ${CI_IMAGE})
-      echo ${DIGEST}
-      digest=$(echo ${DIGEST} | awk '{print $2}')
-      echo "${CI_APPLICATION_REPOSITORY}@${digest}" >> image-digest-all.txt
+      if [[ -z "${CI_COMMIT_TAG}" ]]; then
+        DIGEST=$(manifest-tool push from-args \
+          --platforms linux/amd64,linux/arm64 \
+          --template ${CI_IMAGE}-ARCH \
+          --target ${CI_IMAGE})
+        echo ${DIGEST}
+        digest=$(echo ${DIGEST} | awk '{print $2}')
+        echo "${CI_APPLICATION_REPOSITORY}@${digest}" >> image-digest-all.txt
+      fi
     - |
       if [[ -n "${CI_COMMIT_TAG}" ]]; then
         DIGEST=$(manifest-tool push from-args \

container/lib.yaml

@@ -6,7 +6,7 @@
           echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
         else
           DOCKER_AUTH=$(echo -n "${DOCKER_USERNAME}:${DOCKER_PASSWORD}" | base64 -w0)
-          echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},\"https://index.docker.io/v1/\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
+          echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
         fi
     - |
         if [[ -z "${CI_COMMIT_TAG}" ]]; then