From b970fd6bf568a3b2574309cf6d509eb19518bcb9 Mon Sep 17 00:00:00 2001 From: David Hiendl Date: Thu, 20 Oct 2022 22:20:07 +0200 Subject: [PATCH] fix drone kaniko build --- drone/BuildImageWithKaniko.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drone/BuildImageWithKaniko.yml b/drone/BuildImageWithKaniko.yml index 533fe1d..f44d073 100644 --- a/drone/BuildImageWithKaniko.yml +++ b/drone/BuildImageWithKaniko.yml @@ -1,4 +1,3 @@ - .BuildImageWithKaniko: &BuildImageWithKaniko name: BuildImageWithKaniko image: gcr.io/kaniko-project/executor:debug @@ -9,18 +8,24 @@ TAG_COMMIT_PREFIX: "commit-" TAG_REF_SLUG_ENABLE: "false" TAG_REF_NORMALIZED_ENABLE: "true" - DOCKERFILE: "$DRONE_WORKSPACE_BASE/Dockerfile" - CONTEXT_DIR: "$DRONE_WORKSPACE_BASE" ADDITIONAL_REGISTRY_DESTINATIONS: "" ADD_CI_REGISTRY_AUTH: "true" commands: + # drone does not support expanding vars in environment values, set defaults via bash + - | + export CONTEXT_DIR="${CONTEXT_DIR:-$DRONE_WORKSPACE_BASE}" + export DOCKERFILE="${DOCKERFILE:-$DRONE_WORKSPACE_BASE/Dockerfile}" + + - env + # add gitlab registry auth - | if [[ "$ADD_CI_REGISTRY_AUTH" == "true" ]]; then mkdir -p /kaniko/.docker - 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 token:$CI_REGISTRY_PASSWORD | base64)\"}}}" > /kaniko/.docker/config.json fi + cat /kaniko/.docker/config.json - IMAGE_DESTS="" @@ -58,4 +63,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 \ No newline at end of file + /kaniko/executor $KANIKO_ARGS $IMAGE_DESTS $ADDITIONAL_REGISTRY_DESTINATIONS