From 2bba189a8fd933ef3b47f158d1639b3efe4a34e1 Mon Sep 17 00:00:00 2001
From: David Hiendl <david.hiendl@dhswt.de>
Date: Thu, 20 Oct 2022 23:04:19 +0200
Subject: [PATCH] renamed drone kaniko build file, correct build branch/tag
 image variables, added global TAG_PREFIX/TAG_SUFFIX

---
 ...ithKaniko.yml => ContainerImageKaniko.yml} | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)
 rename drone/{BuildImageWithKaniko.yml => ContainerImageKaniko.yml} (72%)

diff --git a/drone/BuildImageWithKaniko.yml b/drone/ContainerImageKaniko.yml
similarity index 72%
rename from drone/BuildImageWithKaniko.yml
rename to drone/ContainerImageKaniko.yml
index e2d83de..fb129aa 100644
--- a/drone/BuildImageWithKaniko.yml
+++ b/drone/ContainerImageKaniko.yml
@@ -1,9 +1,11 @@
-.BuildImageWithKaniko: &BuildImageWithKaniko
-  name: BuildImageWithKaniko
+.ContainerImageKaniko: &ContainerImageKaniko
+  name: ContainerImageKaniko
   image: gcr.io/kaniko-project/executor:debug
   
   environment:
     KANIKO_ARGS: ""
+    TAG_PREFIX: ""
+    TAG_SUFFIX: ""
     TAG_COMMIT_ENABLE: "true"
     TAG_COMMIT_PREFIX: "commit-"
     TAG_REF_SLUG_ENABLE: "false"
@@ -29,20 +31,19 @@
     # default tag based on commit
     - |
       if [[ "$TAG_COMMIT_ENABLE" == "true" ]]; then
-        IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$TAG_COMMIT_PREFIX$CI_COMMIT_SHA"
-      fi
-
-    # add tag for reference if available using slug
-    - |
-      if [[ "$TAG_REF_SLUG_ENABLE" == "true" ]] && [[ ! -z $CI_COMMIT_REF_NAME ]]; then
-        IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+        IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$TAG_PREFIX$TAG_COMMIT_PREFIX$CI_COMMIT_SHA$TAG_SUFFIX"
       fi
 
     # add tag for reference if available using normalization
+    # - attempt to build tag first
+    # - attempt to build branch if not a PR (if not PR for extra security, variable description on drone unclear)
     - |
-      if [[ "$TAG_REF_NORMALIZED_ENABLE" == "true" ]] && [[ ! -z $CI_COMMIT_REF_NAME ]]; then
-        REF_TAG_NORMALIZED=$(echo $CI_COMMIT_REF_NAME | sed s:/:-:g)
-        IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$REF_TAG_NORMALIZED"
+      if [[ "$TAG_REF_NORMALIZED_ENABLE" == "true" ]] && [[ ! -z $DRONE_TAG ]]; then
+        REF_TAG_NORMALIZED=$(echo $DRONE_TAG | sed s:/:-:g)
+        IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$TAG_PREFIX$REF_TAG_NORMALIZED$TAG_SUFFIX"
+      elif [[ "$TAG_REF_NORMALIZED_ENABLE" == "true" ]] && [[ -z "$DRONE_PULL_REQUEST" ]] && [[ ! -z $DRONE_BRANCH ]]; then
+        REF_TAG_NORMALIZED=$(echo $DRONE_BRANCH | sed s:/:-:g)
+        IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$TAG_PREFIX$REF_TAG_NORMALIZED$TAG_SUFFIX"
       fi
     
     - |
@@ -60,4 +61,4 @@
       echo "kaniko args: $KANIKO_ARGS"
       echo "pushing to destinations: $IMAGE_DESTS"
       echo "pushing to additional destinations: $ADDITIONAL_REGISTRY_DESTINATIONS"
-      /kaniko/executor $KANIKO_ARGS $IMAGE_DESTS $ADDITIONAL_REGISTRY_DESTINATIONS
+      /kaniko/executor $KANIKO_ARGS $IMAGE_DESTS $ADDITIONAL_REGISTRY_DESTINATIONS
\ No newline at end of file