From f423e2aa0f5e44ab1522401bf3cb790bac6e5086 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 2 Oct 2019 11:00:46 +0200 Subject: [PATCH] [SKIP CI] fix tagging in drone pipeline --- .drone.jsonnet | 6 +++--- .drone.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 5170ca5..7ea8ce1 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -21,7 +21,7 @@ local PipelineBuild(os='linux', arch='amd64') = { username: { from_secret: "docker_username" }, password: { from_secret: "docker_password" }, build_args: { - KANBOARD_VERSION: "${DRONE_TAG%??}", + KANBOARD_VERSION: "${DRONE_TAG%-*}", }, }, }, @@ -37,7 +37,7 @@ local PipelineBuild(os='linux', arch='amd64') = { username: { from_secret: "docker_username" }, password: { from_secret: "docker_password" }, build_args: { - KANBOARD_VERSION: "${DRONE_TAG%??}", + KANBOARD_VERSION: "${DRONE_TAG%-*}", }, }, when: { @@ -79,7 +79,7 @@ local PipelineNotifications(depends_on=[]) = { pull: "always", settings: { ignore_missing: true, - tags: ["${DRONE_TAG}", "${DRONE_TAG%??}", "${DRONE_TAG%.*}", "${DRONE_TAG%%.*}"], + tags: ["${DRONE_TAG}", "${DRONE_TAG%-*}", "${DRONE_TAG%.*}", "${DRONE_TAG%%.*}"], username: { from_secret: "docker_username" }, password: { from_secret: "docker_password" }, spec: "./manifest.tmpl", diff --git a/.drone.yml b/.drone.yml index 65922b8..ef7a125 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: image: plugins/docker:linux-amd64 settings: build_args: - KANBOARD_VERSION: "${DRONE_TAG%??}" + KANBOARD_VERSION: "${DRONE_TAG%-*}" dockerfile: ./Dockerfile.linux.amd64 dry_run: true password: @@ -29,7 +29,7 @@ steps: auto_tag: true auto_tag_suffix: linux-amd64 build_args: - KANBOARD_VERSION: "${DRONE_TAG%??}" + KANBOARD_VERSION: "${DRONE_TAG%-*}" dockerfile: ./Dockerfile.linux.amd64 password: from_secret: docker_password @@ -74,7 +74,7 @@ steps: spec: ./manifest.tmpl tags: - "${DRONE_TAG}" - - "${DRONE_TAG%??}" + - "${DRONE_TAG%-*}" - "${DRONE_TAG%.*}" - "${DRONE_TAG%%.*}" username: @@ -134,6 +134,6 @@ depends_on: --- kind: signature -hmac: 8447dceeb657d620f0f0ac6dff3bdb4cc520961c7ccd7a7efc84f1401716b14d +hmac: e4f6bc169c5cf8661b73dd9b921f6facd998f0c3035f29b53998f35315b7af32 ...