From 6a8481b66cf6346c4d183a4ae7ad0174ef6b924e Mon Sep 17 00:00:00 2001 From: David Hiendl Date: Sat, 22 Oct 2022 11:28:04 +0200 Subject: [PATCH] drone/ContainerImageKaniko: merged commands into single multiline string and added sub-anchor to allow running commands before/after --- drone/ContainerImageKaniko.yml | 38 +++++++++++++++------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/drone/ContainerImageKaniko.yml b/drone/ContainerImageKaniko.yml index 10e0e6b..41a96fe 100644 --- a/drone/ContainerImageKaniko.yml +++ b/drone/ContainerImageKaniko.yml @@ -18,30 +18,28 @@ ADD_CI_REGISTRY_AUTH: "true" commands: - # drone does not support expanding vars in environment values, set defaults via bash - - | + - &ContainerImageKanikoCommands | + + # drone does not support expanding vars in environment values, set defaults via bash if [[ -z "$CONTEXT_DIR" ]]; then CONTEXT_DIR="$DRONE_WORKSPACE_BASE"; fi if [[ -z "$DOCKERFILE" ]]; then DOCKERFILE="$DRONE_WORKSPACE_BASE/Dockerfile"; fi - # add gitlab registry auth - - | + # add gitlab registry auth if [[ "$ADD_CI_REGISTRY_AUTH" == "true" ]]; then mkdir -p /kaniko/.docker echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n token:$CI_REGISTRY_PASSWORD | base64)\"}}}" > /kaniko/.docker/config.json fi - - IMAGE_DESTS="" + IMAGE_DESTS="" - # default tag based on commit - - | + # default tag based on commit if [[ "$TAG_COMMIT_ENABLE" == "true" ]]; then IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$TAG_PREFIX$TAG_COMMIT_PREFIX$CI_COMMIT_SHA$TAG_SUFFIX" fi - # add semver major tag if enabled and available, exclude "0" tag - # add semver major.minor tag if enabled and available, exclude "0.0" tag - # add semver major.minor.patch tag if enabled and available, exclude "0.0.0" tag - - | + # add semver major tag if enabled and available, exclude "0" tag + # add semver major.minor tag if enabled and available, exclude "0.0" tag + # add semver major.minor.patch tag if enabled and available, exclude "0.0.0" tag if [[ "$TAG_SEMVER_MAJOR" == "true" ]] && [[ ! -z $SEMVER_MAJOR ]] && [[ "$SEMVER_MAJOR" != "0" ]]; then IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$TAG_PREFIX$SEMVER_MAJOR" TAG_REF_NORMALIZED_ENABLE=0 @@ -55,11 +53,10 @@ TAG_REF_NORMALIZED_ENABLE=0 fi - # add tag for reference if available using normalization - # - dont add tag if semver tags were added - # - attempt to build tag first - # - attempt to build branch if not a PR (if not PR for extra security, variable description on drone unclear) - - | + # add tag for reference if available using normalization + # - dont add tag if semver tags were added + # - attempt to build tag first + # - attempt to build branch if not a PR (if not PR for extra security, variable description on drone unclear) echo "TAG_REF_NORMALIZED_ENABLE=$TAG_REF_NORMALIZED_ENABLE" if [[ "$TAG_REF_NORMALIZED_ENABLE" == "true" ]] && [[ ! -z $DRONE_TAG ]]; then REF_TAG_NORMALIZED=$(echo $DRONE_TAG | sed s:/:-:g) @@ -69,20 +66,19 @@ IMAGE_DESTS="$IMAGE_DESTS --destination $CI_REGISTRY_IMAGE:$TAG_PREFIX$REF_TAG_NORMALIZED$TAG_SUFFIX" fi - # prepare kaniko args - - | + # prepare kaniko args if [[ -z "$KANIKO_ARGS" ]]; then KANIKO_ARGS="" fi - KANIKO_ARGS="$KANIKO_ARGS --context $CONTEXT_DIR --dockerfile $DOCKERFILE" + KANIKO_ARGS="--context $CONTEXT_DIR --dockerfile $DOCKERFILE $KANIKO_ARGS" if [[ "KANIKO_SINGLE_SNAPSHOT" ]]; then KANIKO_ARGS="$KANIKO_ARGS --single-snapshot" fi - # build image - - | + # build image 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 +