From a1903e6f1a48fb417caf6786c8026d5af9ef0c82 Mon Sep 17 00:00:00 2001 From: Juho Inkinen Date: Tue, 16 Jul 2019 10:43:10 +0300 Subject: [PATCH 1/8] Attempt image autotagging with dry run (no image pushing) --- .drone.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7f2c72117..0d6a5ff72 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ kind: pipeline name: default steps: - - name: docker + - name: docker-tagged-release image: plugins/docker settings: dockerfile: Dockerfile @@ -12,22 +12,12 @@ steps: from_secret: docker_password registry: quay.io repo: quay.io/natlibfi/annif - tags: [latest] - - - name: docker-dev - image: plugins/docker - settings: - dockerfile: Dockerfile-dev - username: - from_secret: docker_username - password: - from_secret: docker_password - registry: quay.io - repo: quay.io/natlibfi/annif - tags: [dev] + auto_tag: true + dry_run: true trigger: branch: - master + - issue297-set-docker-image-tag-from-git-tag event: - push From 5e9581d61d8ab5b65a55060c53527dda18505c09 Mon Sep 17 00:00:00 2001 From: Juho Inkinen Date: Tue, 16 Jul 2019 10:50:19 +0300 Subject: [PATCH 2/8] Reattempt without dryrun; previously build was "skipped" --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0d6a5ff72..6198c4236 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,6 @@ steps: registry: quay.io repo: quay.io/natlibfi/annif auto_tag: true - dry_run: true trigger: branch: From 28a226afbc1affaf96b99c6a9db102dbec7ca1f1 Mon Sep 17 00:00:00 2001 From: Juho Inkinen Date: Tue, 16 Jul 2019 10:52:04 +0300 Subject: [PATCH 3/8] Reattempt; still skipped build --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 6198c4236..19ee8c3a7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,8 @@ steps: from_secret: docker_password registry: quay.io repo: quay.io/natlibfi/annif - auto_tag: true + tag: [test-tag] + dry_run: true trigger: branch: From bdfc83160a5bb5a2395884f4ce2cc39c88115430 Mon Sep 17 00:00:00 2001 From: Juho Inkinen Date: Tue, 16 Jul 2019 11:12:11 +0300 Subject: [PATCH 4/8] Revert "Reattempt; still skipped build" This reverts commit 28a226afbc1affaf96b99c6a9db102dbec7ca1f1. --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 19ee8c3a7..6198c4236 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,8 +12,7 @@ steps: from_secret: docker_password registry: quay.io repo: quay.io/natlibfi/annif - tag: [test-tag] - dry_run: true + auto_tag: true trigger: branch: From 2248b8878e953798434bfb26b93cff7f7ccf668a Mon Sep 17 00:00:00 2001 From: Juho Inkinen Date: Tue, 16 Jul 2019 11:13:12 +0300 Subject: [PATCH 5/8] Revert "Reattempt without dryrun; previously build was "skipped"" This reverts commit 5e9581d61d8ab5b65a55060c53527dda18505c09. --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 6198c4236..0d6a5ff72 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,6 +13,7 @@ steps: registry: quay.io repo: quay.io/natlibfi/annif auto_tag: true + dry_run: true trigger: branch: From e5cd04a14f21107377d204f643bc60fb6068e9fa Mon Sep 17 00:00:00 2001 From: Juho Inkinen Date: Tue, 16 Jul 2019 11:15:21 +0300 Subject: [PATCH 6/8] Revert "Attempt image autotagging with dry run (no image pushing)" This reverts commit a1903e6f1a48fb417caf6786c8026d5af9ef0c82. --- .drone.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0d6a5ff72..7f2c72117 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ kind: pipeline name: default steps: - - name: docker-tagged-release + - name: docker image: plugins/docker settings: dockerfile: Dockerfile @@ -12,12 +12,22 @@ steps: from_secret: docker_password registry: quay.io repo: quay.io/natlibfi/annif - auto_tag: true - dry_run: true + tags: [latest] + + - name: docker-dev + image: plugins/docker + settings: + dockerfile: Dockerfile-dev + username: + from_secret: docker_username + password: + from_secret: docker_password + registry: quay.io + repo: quay.io/natlibfi/annif + tags: [dev] trigger: branch: - master - - issue297-set-docker-image-tag-from-git-tag event: - push From 0a83a804d32be86dd47455ebe523d3be1be187a3 Mon Sep 17 00:00:00 2001 From: Juho Inkinen Date: Tue, 16 Jul 2019 11:24:27 +0300 Subject: [PATCH 7/8] Tag image with git tag when doing the git tagging --- .drone.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.drone.yml b/.drone.yml index 7f2c72117..e0e84dc36 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,6 +26,20 @@ steps: repo: quay.io/natlibfi/annif tags: [dev] + - name: docker-tag-image-with-git-tag + image: plugins/docker + settings: + dockerfile: Dockerfile + username: + from_secret: docker_username + password: + from_secret: docker_password + registry: quay.io + repo: quay.io/natlibfi/annif + auto_tag: true + when: + event: tag + trigger: branch: - master From e803950128016f289d0d99c84e502bf33dd3056f Mon Sep 17 00:00:00 2001 From: Juho Inkinen Date: Tue, 16 Jul 2019 11:26:35 +0300 Subject: [PATCH 8/8] Fix indentation --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e0e84dc36..b4f01d0fd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,7 +26,7 @@ steps: repo: quay.io/natlibfi/annif tags: [dev] - - name: docker-tag-image-with-git-tag + - name: docker-tag-image-with-git-tag image: plugins/docker settings: dockerfile: Dockerfile