added normalized variant of image tag replacing only slashes with hyphens
This commit is contained in:
parent
598a5c364d
commit
c0b9bf6291
@ -9,13 +9,14 @@
|
|||||||
KANIKO_ARGS: ""
|
KANIKO_ARGS: ""
|
||||||
TAG_COMMIT_ENABLE: "true"
|
TAG_COMMIT_ENABLE: "true"
|
||||||
TAG_COMMIT_PREFIX: "commit-"
|
TAG_COMMIT_PREFIX: "commit-"
|
||||||
TAG_REF_SLUG_ENABLE: "true"
|
TAG_REF_SLUG_ENABLE: "false"
|
||||||
|
TAG_REF_NORMALIZED_ENABLE: "true"
|
||||||
DOCKERFILE: "$CI_PROJECT_DIR/Dockerfile"
|
DOCKERFILE: "$CI_PROJECT_DIR/Dockerfile"
|
||||||
CONTEXT_DIR: "$CI_PROJECT_DIR"
|
CONTEXT_DIR: "$CI_PROJECT_DIR"
|
||||||
ADDITIONAL_REGISTRY_DESTINATIONS: ""
|
ADDITIONAL_REGISTRY_DESTINATIONS: ""
|
||||||
ADD_GITLAB_REGISTRY_AUTH: "true"
|
ADD_GITLAB_REGISTRY_AUTH: "true"
|
||||||
|
|
||||||
before_script:
|
script:
|
||||||
# add gitlab registry auth
|
# add gitlab registry auth
|
||||||
- |
|
- |
|
||||||
if [[ "$ADD_GITLAB_REGISTRY_AUTH" == "true" ]]; then
|
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
|
echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64)\"}}}" > /kaniko/.docker/config.json
|
||||||
fi
|
fi
|
||||||
|
|
||||||
script:
|
|
||||||
- IMAGE_DESTS=""
|
- IMAGE_DESTS=""
|
||||||
|
|
||||||
# default tag based on commit
|
# default tag based on commit
|
||||||
@ -32,11 +32,18 @@
|
|||||||
IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$TAG_COMMIT_PREFIX-$CI_COMMIT_SHA"
|
IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$TAG_COMMIT_PREFIX-$CI_COMMIT_SHA"
|
||||||
fi
|
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
|
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:$CI_COMMIT_REF_SLUG"
|
||||||
fi
|
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
|
if [[ -z "$KANIKO_ARGS" ]]; then
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user