From 952ff81c4f23d5129c244c7022d5e176c34f7f40 Mon Sep 17 00:00:00 2001
From: Chris Evich <chris_gitlab@icuc.me>
Date: Sun, 13 Nov 2022 18:45:10 -0500
Subject: [PATCH] Update image tagging w/ `mr` prefix for MRs

Prevent any possiblilty of confusion for tags (prefixed with a `v`) vs MR tags
(previously no prefix).

Signed-off-by: Chris Evich <chris_gitlab@icuc.me>
---
 .gitlab-ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index baf1396..5be0e1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,10 +17,11 @@ build:
   script:
     - mkdir -p /kaniko/.docker
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - IMAGE_TAG="${CI_COMMIT_TAG:+${CI_COMMIT_TAG}}${CI_MERGE_REQUEST_IID:+mr${CI_MERGE_REQUEST_IID}${CI_COMMIT_BRANCH:+${CI_COMMIT_BRANCH/main/latest}}"
     - >-
-        /kaniko/executor \
-            --context $CI_PROJECT_DIR \
-            --dockerfile $CI_PROJECT_DIR/Containerfile \
-            --destination "$CI_REGISTRY_IMAGE:${CI_COMMIT_TAG:-${CI_MERGE_REQUEST_IID:-${CI_COMMIT_BRANCH/main/latest}}}" \
-            --build-arg "BASE_TAG=$BASE_TAG" \
+        /kaniko/executor
+            --context $CI_PROJECT_DIR
+            --dockerfile $CI_PROJECT_DIR/Containerfile
+            --destination "$CI_REGISTRY_IMAGE:${IAMGE_TAG}"
+            --build-arg "BASE_TAG=$BASE_TAG"
             --build-arg "FLAVOR=$FLAVOR"