From c0b9bf6291dadd66e91f7e37b3add4afbb95e414 Mon Sep 17 00:00:00 2001 From: David Hiendl Date: Mon, 10 Oct 2022 12:47:35 +0200 Subject: [PATCH] added normalized variant of image tag replacing only slashes with hyphens --- gitlab/ContainerBuildKaniko.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gitlab/ContainerBuildKaniko.yml b/gitlab/ContainerBuildKaniko.yml index 40565e7..aa3e52c 100644 --- a/gitlab/ContainerBuildKaniko.yml +++ b/gitlab/ContainerBuildKaniko.yml @@ -9,13 +9,14 @@ KANIKO_ARGS: "" TAG_COMMIT_ENABLE: "true" TAG_COMMIT_PREFIX: "commit-" - TAG_REF_SLUG_ENABLE: "true" + TAG_REF_SLUG_ENABLE: "false" + TAG_REF_NORMALIZED_ENABLE: "true" DOCKERFILE: "$CI_PROJECT_DIR/Dockerfile" CONTEXT_DIR: "$CI_PROJECT_DIR" ADDITIONAL_REGISTRY_DESTINATIONS: "" ADD_GITLAB_REGISTRY_AUTH: "true" - before_script: + script: # add gitlab registry auth - | if [[ "$ADD_GITLAB_REGISTRY_AUTH" == "true" ]]; then @@ -23,7 +24,6 @@ echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64)\"}}}" > /kaniko/.docker/config.json fi - script: - IMAGE_DESTS="" # default tag based on commit @@ -32,11 +32,18 @@ IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$TAG_COMMIT_PREFIX-$CI_COMMIT_SHA" fi - # add tag for reference if available + # 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" fi + + # add tag for reference if available using normalization + - | + 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" + fi - | if [[ -z "$KANIKO_ARGS" ]]; then