From ac9914ae164ce71752ea22934d89a631c156e9a1 Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Wed, 21 Feb 2024 22:23:47 +0930
Subject: [PATCH] fix(build): ensure the correct tags and architectures are
 published

!7
---
 .gitlab-ci.yml | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48c6253..f24afbb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -151,36 +151,45 @@ Github (Push --mirror):
     - docker login docker.io -u $NFC_DOCKERHUB_USERNAME -p $NFC_DOCKERHUB_TOKEN
     - docker image ls
     - |
-      DOCKER_HUB_TAG=dev
+      # DOCKER_HUB_TAG=dev
 
-      echo "[DEBUG] default: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
+      # 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
+      #   DOCKER_HUB_TAG=latest
 
-        echo "[DEBUG] stable: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
+      #   echo "[DEBUG] stable: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
 
-      elif [ "$CI_COMMIT_BRANCH" == "development" ]; then
+      # fi;
 
-          DOCKER_HUB_TAG=dev
+      # if [ "$CI_COMMIT_BRANCH" == "development" ]; then
 
-          echo "[DEBUG] dev: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
+      #     DOCKER_HUB_TAG=dev
+
+      #     echo "[DEBUG] dev: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
+
+      # fi;
 
-      fi;
 
       echo "[DEBUG] DOCKER_IMAGE_PUBLISH_NAME=$DOCKER_IMAGE_PUBLISH_NAME";
 
-      echo "[DEBUG] final: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
+      # echo "[DEBUG] final: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
 
       echo "[DEBUG] DOCKER_MULTI_ARCH_IMAGES=$DOCKER_MULTI_ARCH_IMAGES";
       
-      docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$DOCKER_HUB_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;
 
+        docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:latest;
+
+      else
+
+        docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:dev;
+
       fi;
 
   after_script: