From ada7a01f3c95fb071aed1df735c70a341ad5d21f Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 11 Jul 2019 16:31:27 +0200 Subject: [PATCH] yuse drone_tag as build arg --- .drone.jsonnet | 6 ++++++ .drone.yml | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index d1cae1f..d69197b 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -20,6 +20,9 @@ local PipelineBuild(os='linux', arch='amd64') = { repo: ' xoxys/ttrss', username: { from_secret: "docker_username" }, password: { from_secret: "docker_password" }, + build_args: { + TTRSS_VERSION: "${DRONE_TAG##v}", + }, }, }, { @@ -33,6 +36,9 @@ local PipelineBuild(os='linux', arch='amd64') = { repo: ' xoxys/ttrss', username: { from_secret: "docker_username" }, password: { from_secret: "docker_password" }, + build_args: { + TTRSS_VERSION: "${DRONE_TAG##v}", + }, }, when: { ref: [ diff --git a/.drone.yml b/.drone.yml index 636b62e..276a78b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,6 +11,8 @@ steps: pull: always image: plugins/docker:linux-amd64 settings: + build_args: + TTRSS_VERSION: "${DRONE_TAG##v}" dockerfile: ./Dockerfile.linux.amd64 dry_run: true password: @@ -26,6 +28,8 @@ steps: settings: auto_tag: true auto_tag_suffix: linux-amd64 + build_args: + TTRSS_VERSION: "${DRONE_TAG##v}" dockerfile: ./Dockerfile.linux.amd64 password: from_secret: docker_password @@ -111,6 +115,6 @@ depends_on: --- kind: signature -hmac: bde1c3cd8c93a7590fdfb4f11e1d6d5c21d6d036e678fe3479ec4147c548c220 +hmac: 070d95c434753c6b95c0a279d9c103f20e3b1b1975ba76b758eaf9bfc8a2e7a9 ...