From 1cf73744e7496a4847a435e02b7d7c6bc31a46a8 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 21 Feb 2024 17:59:41 +0930 Subject: [PATCH] fix(ci): ensure docker publish uses correct tag !5 --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f97f3e..50a16e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,7 +155,7 @@ Github (Push --mirror): echo "[DEBUG] default: DOCKER_HUB_TAG=$DOCKER_HUB_TAG"; - if [ "$CI_COMMIT_BRANCH" != "master" ]; then + if [ "$CI_COMMIT_BRANCH" == "master" ]; then DOCKER_HUB_TAG=latest @@ -177,7 +177,11 @@ Github (Push --mirror): docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$DOCKER_HUB_TAG; - docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$CI_COMMIT_TAG; + if [ "${CI_COMMIT_TAG}" ]; then + + docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$CI_COMMIT_TAG; + + fi; after_script: - docker logout docker.io