From f8c0a0c447e783ff2b0c8aefb1d1eabd440c138f Mon Sep 17 00:00:00 2001 From: micha Date: Thu, 27 Oct 2022 20:48:47 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E2=80=9Edrone/ContainerImageDocker.yml?= =?UTF-8?q?=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Docker Buildkit --- drone/ContainerImageDocker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/drone/ContainerImageDocker.yml b/drone/ContainerImageDocker.yml index 9fcc8c6..f962f4c 100644 --- a/drone/ContainerImageDocker.yml +++ b/drone/ContainerImageDocker.yml @@ -41,6 +41,7 @@ DEBUG_STEP: "false" PUSH_TAGS: "true" DOCKER_WAIT_START_SECONDS: "5" + DOCKER_BUILDKIT: 1 commands: - &ContainerImageDockerCommands | From 444f906cbef20da27ee34dd57a16162d28f6b83a Mon Sep 17 00:00:00 2001 From: micha Date: Sat, 29 Oct 2022 11:09:00 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E2=80=9Edrone/HelmChart.yml=E2=80=9C=20?= =?UTF-8?q?=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allow to tag based on chart version --- drone/HelmChart.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drone/HelmChart.yml b/drone/HelmChart.yml index bfdd829..b9bc868 100644 --- a/drone/HelmChart.yml +++ b/drone/HelmChart.yml @@ -22,6 +22,7 @@ CHART_PATH: "./chart" + TAG_CHART_VERSION_ENABLE: "false" TAG_COMMIT_ENABLE: "true" TAG_COMMIT_BASE_VERSION: "0.0.0" TAG_COMMIT_PREFIX: "commit-" @@ -61,7 +62,15 @@ if [[ "$GITLAB_HELM_REPO_AUTH" == "true" ]]; then helm repo add --username="${CI_REGISTRY_USER}" --password="${CI_REGISTRY_PASSWORD}" "$HELM_REPO_NAME" $HELM_STABLE_ENDPOINT fi - + + # tag based on chart version, install jq first + - | + if [[ "$TAG_CHART_VERSION_ENABLE" == "true" ]]; then + apk add jq + CHART_VERSION=$(cat Chart.yaml | yq .version) + helm cm-push . "$HELM_REPO_NAME" --version=$CHART_VERSION + fi + # default tag based on commit - | if [[ "$TAG_COMMIT_ENABLE" == "true" ]]; then