From 9c208de7ebfb60dd246e72eac92508ad4838a37c Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 10 Jan 2021 15:27:29 +0100 Subject: [PATCH] test multiarch --- .drone.jsonnet | 31 +------------------------------ .drone.yml | 32 +++++--------------------------- manifest.tmpl | 24 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 57 deletions(-) create mode 100644 manifest.tmpl diff --git a/.drone.jsonnet b/.drone.jsonnet index 74154e8..d347fd2 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -135,20 +135,6 @@ local PipelineNotifications = { status: ['success'], }, }, - { - image: 'plugins/manifest', - name: 'manifest-quay', - settings: { - ignore_missing: true, - auto_tag: true, - username: { from_secret: 'quay_username' }, - password: { from_secret: 'quay_password' }, - spec: 'manifest-quay.tmpl', - }, - when: { - status: ['success'], - }, - }, { name: 'pushrm-dockerhub', pull: 'always', @@ -162,22 +148,7 @@ local PipelineNotifications = { }, PUSHRM_FILE: 'README.md', PUSHRM_SHORT: 'Rootless Alpine base image', - PUSHRM_TARGET: 'thegeeklab/${DRONE_REPO_NAME}', - }, - when: { - status: ['success'], - }, - }, - { - name: 'pushrm-quay', - pull: 'always', - image: 'chko/docker-pushrm:1', - environment: { - APIKEY__QUAY_IO: { - from_secret: 'quay_token', - }, - PUSHRM_FILE: 'README.md', - PUSHRM_TARGET: 'quay.io/thegeeklab/${DRONE_REPO_NAME}', + PUSHRM_TARGET: 'thegeeklab/buildx-alpine', }, when: { status: ['success'], diff --git a/.drone.yml b/.drone.yml index d1c79c5..1acbee3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -299,20 +299,6 @@ steps: status: - success -- name: manifest-quay - image: plugins/manifest - settings: - auto_tag: true - ignore_missing: true - password: - from_secret: quay_password - spec: manifest-quay.tmpl - username: - from_secret: quay_username - when: - status: - - success - - name: pushrm-dockerhub pull: always image: chko/docker-pushrm:1 @@ -323,19 +309,7 @@ steps: from_secret: docker_username PUSHRM_FILE: README.md PUSHRM_SHORT: Rootless Alpine base image - PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME} - when: - status: - - success - -- name: pushrm-quay - pull: always - image: chko/docker-pushrm:1 - environment: - APIKEY__QUAY_IO: - from_secret: quay_token - PUSHRM_FILE: README.md - PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME} + PUSHRM_TARGET: thegeeklab/buildx-alpine when: status: - success @@ -373,4 +347,8 @@ depends_on: - build-container-arm64 - build-container-arm +--- +kind: signature +hmac: 39e9ac95938031473dc7a55e779e7a7e103a95dd8c89c4a0ca5ec1dea6493b6c + ... diff --git a/manifest.tmpl b/manifest.tmpl new file mode 100644 index 0000000..32274ea --- /dev/null +++ b/manifest.tmpl @@ -0,0 +1,24 @@ +image: thegeeklab/buildx-alpine:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +{{#if build.tags}} +tags: +{{#each build.tags}} + - {{this}} +{{/each}} +{{/if}} +manifests: + - image: thegeeklab/buildx-alpine:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64 + platform: + architecture: amd64 + os: linux + + - image: thegeeklab/buildx-alpine:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64 + platform: + architecture: arm64 + os: linux + variant: v8 + + - image: thegeeklab/buildx-alpine:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm + platform: + architecture: arm + os: linux + variant: v7