From e52d62f412eb5d1e7bc68aeecc5f1bbc1d4192cf Mon Sep 17 00:00:00 2001
From: Roman Azarenko <roman.azarenko@iopsys.eu>
Date: Tue, 1 Mar 2022 15:57:37 +0100
Subject: [PATCH] Generate images for tags and non-default branches

---
 .gitlab-ci.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7562da2..d47d67b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,14 +9,18 @@ docker:
     name: gcr.io/kaniko-project/executor:v1.7.0-debug
     entrypoint: [""]
   script:
+    - |
+        CONTAINER_TAG="${CI_COMMIT_REF_SLUG}"
+        if [ "${CONTAINER_TAG}" = "${CI_DEFAULT_BRANCH}" ]; then
+          CONTAINER_TAG="latest"
+        fi
     - mkdir -p /kaniko/.docker
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - |
         /kaniko/executor \
-          --context ${CI_PROJECT_DIR} \
-          --dockerfile ${CI_PROJECT_DIR}/Dockerfile \
-          --destination ${CI_REGISTRY_IMAGE}:latest
+          --context "${CI_PROJECT_DIR}" \
+          --dockerfile "${CI_PROJECT_DIR}/Dockerfile" \
+          --destination "${CI_REGISTRY_IMAGE}:${CONTAINER_TAG}"
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-    - if: '$CI_PIPELINE_SOURCE == "web" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-  interruptible: true
+    - if: '$CI_PIPELINE_SOURCE == "push"
+    - if: '$CI_PIPELINE_SOURCE == "web"
-- 
GitLab