fix version handling in drone pipeline
Some checks reported errors
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build was killed

This commit is contained in:
Robert Kaussow 2019-07-22 09:10:14 +02:00
parent b133b3c899
commit 0a382684fe
2 changed files with 5 additions and 9 deletions

View File

@ -21,8 +21,7 @@ local PipelineBuild(os='linux', arch='amd64') = {
username: { from_secret: "docker_username" }, username: { from_secret: "docker_username" },
password: { from_secret: "docker_password" }, password: { from_secret: "docker_password" },
build_args: { build_args: {
KANBOARD_ORG_VERSION: "${DRONE_TAG##v}", KANBOARD_VERSION: "${DRONE_TAG%.*}",
KANBOARD_VERSION: "${KANBOARD_ORG_VERSION%.*}",
}, },
}, },
}, },
@ -38,8 +37,7 @@ local PipelineBuild(os='linux', arch='amd64') = {
username: { from_secret: "docker_username" }, username: { from_secret: "docker_username" },
password: { from_secret: "docker_password" }, password: { from_secret: "docker_password" },
build_args: { build_args: {
KANBOARD_ORG_VERSION: "${DRONE_TAG##v}", KANBOARD_VERSION: "${DRONE_TAG%.*}",
KANBOARD_VERSION: "${KANBOARD_ORG_VERSION%.*}",
}, },
}, },
when: { when: {

View File

@ -12,8 +12,7 @@ steps:
image: plugins/docker:linux-amd64 image: plugins/docker:linux-amd64
settings: settings:
build_args: build_args:
KANBOARD_ORG_VERSION: "${DRONE_TAG##v}" KANBOARD_VERSION: "${DRONE_TAG%.*}"
KANBOARD_VERSION: "${KANBOARD_ORG_VERSION%.*}"
dockerfile: ./Dockerfile.linux.amd64 dockerfile: ./Dockerfile.linux.amd64
dry_run: true dry_run: true
password: password:
@ -30,8 +29,7 @@ steps:
auto_tag: true auto_tag: true
auto_tag_suffix: linux-amd64 auto_tag_suffix: linux-amd64
build_args: build_args:
KANBOARD_ORG_VERSION: "${DRONE_TAG##v}" KANBOARD_VERSION: "${DRONE_TAG%.*}"
KANBOARD_VERSION: "${KANBOARD_ORG_VERSION%.*}"
dockerfile: ./Dockerfile.linux.amd64 dockerfile: ./Dockerfile.linux.amd64
password: password:
from_secret: docker_password from_secret: docker_password
@ -118,6 +116,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: 0d583dcd9b7570914cd0e5b0f6c96acb7d4d40c4cdb37a9d8e1d2c0c0c24f855 hmac: b6bf7aecbc8f3bee2e88539b0321d1bab96eff359ca336fb3ededb2e5d4e9cd7
... ...