From 9f9a121b2aa05f0ff86bea6e1676979089422dd9 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 10 Jan 2021 23:01:15 +0100 Subject: [PATCH] test buildx plugin --- .drone.jsonnet | 7 ++----- .drone.yml | 27 ++++++++++----------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 0e16dbb..e77c34c 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -53,16 +53,14 @@ local PipelineBuildContainer(arch='amd64') = { DOCKER_AUTOTAG_IGNORE_PRERELEASE: 'True', DOCKER_AUTOTAG_OUTPUT_FILE: '.tags', DOCKER_AUTOTAG_VERSION: '${DRONE_TAG}', + DOCKER_AUTOTAG_SUFFIX: std.split(arch, '_')[0], }, - when: { - ref: ['refs/heads/main', 'refs/tags/**'], - }, + depends_on: ['dryrun'], }, { name: 'publish-dockerhub', image: 'thegeeklab/drone-docker-buildx', settings: { - auto_tag_suffix: std.split(arch, '_')[0], dockerfile: 'Dockerfile.' + std.split(arch, '_')[0], repo: 'thegeeklab/buildx-alpine', username: { from_secret: 'docker_username' }, @@ -95,7 +93,6 @@ local PipelineNotifications = { name: 'manifest-dockerhub', settings: { ignore_missing: true, - auto_tag: true, username: { from_secret: 'docker_username' }, password: { from_secret: 'docker_password' }, spec: 'manifest.tmpl', diff --git a/.drone.yml b/.drone.yml index 62a45be..618f2d0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -50,16 +50,14 @@ steps: DOCKER_AUTOTAG_FORCE_LATEST: True DOCKER_AUTOTAG_IGNORE_PRERELEASE: True DOCKER_AUTOTAG_OUTPUT_FILE: .tags + DOCKER_AUTOTAG_SUFFIX: amd64 DOCKER_AUTOTAG_VERSION: ${DRONE_TAG} - when: - ref: - - refs/heads/main - - refs/tags/** + depends_on: + - dryrun - name: publish-dockerhub image: thegeeklab/drone-docker-buildx settings: - auto_tag_suffix: amd64 dockerfile: Dockerfile.amd64 password: from_secret: docker_password @@ -114,16 +112,14 @@ steps: DOCKER_AUTOTAG_FORCE_LATEST: True DOCKER_AUTOTAG_IGNORE_PRERELEASE: True DOCKER_AUTOTAG_OUTPUT_FILE: .tags + DOCKER_AUTOTAG_SUFFIX: arm64 DOCKER_AUTOTAG_VERSION: ${DRONE_TAG} - when: - ref: - - refs/heads/main - - refs/tags/** + depends_on: + - dryrun - name: publish-dockerhub image: thegeeklab/drone-docker-buildx settings: - auto_tag_suffix: arm64 dockerfile: Dockerfile.arm64 password: from_secret: docker_password @@ -178,16 +174,14 @@ steps: DOCKER_AUTOTAG_FORCE_LATEST: True DOCKER_AUTOTAG_IGNORE_PRERELEASE: True DOCKER_AUTOTAG_OUTPUT_FILE: .tags + DOCKER_AUTOTAG_SUFFIX: arm DOCKER_AUTOTAG_VERSION: ${DRONE_TAG} - when: - ref: - - refs/heads/main - - refs/tags/** + depends_on: + - dryrun - name: publish-dockerhub image: thegeeklab/drone-docker-buildx settings: - auto_tag_suffix: arm dockerfile: Dockerfile.arm password: from_secret: docker_password @@ -222,7 +216,6 @@ steps: - name: manifest-dockerhub image: plugins/manifest settings: - auto_tag: true ignore_missing: true password: from_secret: docker_password @@ -280,6 +273,6 @@ depends_on: --- kind: signature -hmac: b3847f881aee6bfdc43ce522705080fb78dd9c0a39e5ec5d3f79a98a9fdd6dd1 +hmac: fbd638a430ac4086311b3be3f9a97296d08bb108e4d0b2d339de75b0814562e6 ...