From 39b76413c662d66fbc48399b2d6eb0d0ff8fcfcd Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Wed, 2 Oct 2019 11:03:10 +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 7b0228d..5464e54 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: {
-          FRESHRSS_VERSION: "${DRONE_TAG%??}",
+          FRESHRSS_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: {
-          FRESHRSS_VERSION: "${DRONE_TAG%??}",
+          FRESHRSS_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 549cc49..9e1386d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,7 +12,7 @@ steps:
   image: plugins/docker:linux-amd64
   settings:
     build_args:
-      FRESHRSS_VERSION: "${DRONE_TAG%??}"
+      FRESHRSS_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:
-      FRESHRSS_VERSION: "${DRONE_TAG%??}"
+      FRESHRSS_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: 3bd8e3ae071d7459e383972f7a94fec44323fb445b20f857b344047cf0b90200
+hmac: b1f02a78cfe4a2b2c421649b5c726134816c4ae76e603b4ec9aca986c9d43058
 
 ...