container/freshrss
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 36 Activity

[SKIP CI] fix tagging in drone pipeline
All checks were successful
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
Robert Kaussow 2019-10-02 11:03:10 +02:00
parent c91a99141e
commit 39b76413c6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.jsonnet
View File

@ -21,7 +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: {
FRESHRSS_VERSION: "${DRONE_TAG%??}", FRESHRSS_VERSION: "${DRONE_TAG%-*}",
}, },
}, },
}, },
@ -37,7 +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: {
FRESHRSS_VERSION: "${DRONE_TAG%??}", FRESHRSS_VERSION: "${DRONE_TAG%-*}",
}, },
}, },
when: { when: {
@ -79,7 +79,7 @@ local PipelineNotifications(depends_on=[]) = {
pull: "always", pull: "always",
settings: { settings: {
ignore_missing: true, 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" }, username: { from_secret: "docker_username" },
password: { from_secret: "docker_password" }, password: { from_secret: "docker_password" },
spec: "./manifest.tmpl", spec: "./manifest.tmpl",

8
.drone.yml
View File

@ -12,7 +12,7 @@ steps:
image: plugins/docker:linux-amd64 image: plugins/docker:linux-amd64
settings: settings:
build_args: build_args:
FRESHRSS_VERSION: "${DRONE_TAG%??}" FRESHRSS_VERSION: "${DRONE_TAG%-*}"
dockerfile: ./Dockerfile.linux.amd64 dockerfile: ./Dockerfile.linux.amd64
dry_run: true dry_run: true
password: password:
@ -29,7 +29,7 @@ steps:
auto_tag: true auto_tag: true
auto_tag_suffix: linux-amd64 auto_tag_suffix: linux-amd64
build_args: build_args:
FRESHRSS_VERSION: "${DRONE_TAG%??}" FRESHRSS_VERSION: "${DRONE_TAG%-*}"
dockerfile: ./Dockerfile.linux.amd64 dockerfile: ./Dockerfile.linux.amd64
password: password:
from_secret: docker_password from_secret: docker_password
@ -74,7 +74,7 @@ steps:
spec: ./manifest.tmpl spec: ./manifest.tmpl
tags: tags:
- "${DRONE_TAG}" - "${DRONE_TAG}"
- "${DRONE_TAG%??}" - "${DRONE_TAG%-*}"
- "${DRONE_TAG%.*}" - "${DRONE_TAG%.*}"
- "${DRONE_TAG%%.*}" - "${DRONE_TAG%%.*}"
username: username:
@ -134,6 +134,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: 3bd8e3ae071d7459e383972f7a94fec44323fb445b20f857b344047cf0b90200 hmac: b1f02a78cfe4a2b2c421649b5c726134816c4ae76e603b4ec9aca986c9d43058
... ...