From 0a382684fe1c12b865f8d2f22200f972ac2dfd91 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Mon, 22 Jul 2019 09:10:14 +0200
Subject: [PATCH] fix version handling in drone pipeline

---
 .drone.jsonnet | 6 ++----
 .drone.yml     | 8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 7ebcff5..d1841dd 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -21,8 +21,7 @@ local PipelineBuild(os='linux', arch='amd64') = {
         username: { from_secret: "docker_username" },
         password: { from_secret: "docker_password" },
         build_args: {
-          KANBOARD_ORG_VERSION: "${DRONE_TAG##v}",
-          KANBOARD_VERSION: "${KANBOARD_ORG_VERSION%.*}",
+          KANBOARD_VERSION: "${DRONE_TAG%.*}",
         },
       },
     },
@@ -38,8 +37,7 @@ local PipelineBuild(os='linux', arch='amd64') = {
         username: { from_secret: "docker_username" },
         password: { from_secret: "docker_password" },
         build_args: {
-          KANBOARD_ORG_VERSION: "${DRONE_TAG##v}",
-          KANBOARD_VERSION: "${KANBOARD_ORG_VERSION%.*}",
+          KANBOARD_VERSION: "${DRONE_TAG%.*}",
         },
       },
       when: {
diff --git a/.drone.yml b/.drone.yml
index 5215582..2fdf036 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,8 +12,7 @@ steps:
   image: plugins/docker:linux-amd64
   settings:
     build_args:
-      KANBOARD_ORG_VERSION: "${DRONE_TAG##v}"
-      KANBOARD_VERSION: "${KANBOARD_ORG_VERSION%.*}"
+      KANBOARD_VERSION: "${DRONE_TAG%.*}"
     dockerfile: ./Dockerfile.linux.amd64
     dry_run: true
     password:
@@ -30,8 +29,7 @@ steps:
     auto_tag: true
     auto_tag_suffix: linux-amd64
     build_args:
-      KANBOARD_ORG_VERSION: "${DRONE_TAG##v}"
-      KANBOARD_VERSION: "${KANBOARD_ORG_VERSION%.*}"
+      KANBOARD_VERSION: "${DRONE_TAG%.*}"
     dockerfile: ./Dockerfile.linux.amd64
     password:
       from_secret: docker_password
@@ -118,6 +116,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 0d583dcd9b7570914cd0e5b0f6c96acb7d4d40c4cdb37a9d8e1d2c0c0c24f855
+hmac: b6bf7aecbc8f3bee2e88539b0321d1bab96eff359ca336fb3ededb2e5d4e9cd7
 
 ...