From 0c4ab0cf064dfb57426380de347cb28567f2cd23 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 11 Jul 2019 22:52:43 +0200 Subject: [PATCH] try double substitution --- .drone.jsonnet | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index d69197b..6da1ab1 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -21,7 +21,8 @@ local PipelineBuild(os='linux', arch='amd64') = { username: { from_secret: "docker_username" }, password: { from_secret: "docker_password" }, build_args: { - TTRSS_VERSION: "${DRONE_TAG##v}", + TTRSS_ORG_VERSION: "${DRONE_TAG##v}", + TTRSS_VERSION: "${TTRSS_ORG_VERSION%.*}", }, }, }, @@ -37,7 +38,8 @@ local PipelineBuild(os='linux', arch='amd64') = { username: { from_secret: "docker_username" }, password: { from_secret: "docker_password" }, build_args: { - TTRSS_VERSION: "${DRONE_TAG##v}", + TTRSS_ORG_VERSION: "${DRONE_TAG##v}", + TTRSS_VERSION: "${TTRSS_ORG_VERSION%.*}", }, }, when: {