From e8a854cf3e337ff9f41dd938801640eaf90c97b7 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 11 Jan 2021 00:18:35 +0100 Subject: [PATCH] fix release binary path --- docker/Dockerfile.amd64 | 2 +- docker/Dockerfile.arm | 4 ++-- docker/Dockerfile.arm64 | 2 +- docker/manifest-quay.tmpl | 24 ++++++++++++++++++++++++ docker/manifest.tmpl | 24 ++++++++++++++++++++++++ 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 docker/manifest-quay.tmpl create mode 100644 docker/manifest.tmpl diff --git a/docker/Dockerfile.amd64 b/docker/Dockerfile.amd64 index 849eeaa..c785b42 100644 --- a/docker/Dockerfile.amd64 +++ b/docker/Dockerfile.amd64 @@ -21,6 +21,6 @@ RUN apk --update add --virtual .build-deps curl && \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* -ADD release/linux/amd64/drone-docker-buildx /bin/ +ADD release/amd64/drone-docker-buildx /bin/ ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "drone-docker-buildx"] diff --git a/docker/Dockerfile.arm b/docker/Dockerfile.arm index 849eeaa..da85630 100644 --- a/docker/Dockerfile.arm +++ b/docker/Dockerfile.arm @@ -1,4 +1,4 @@ -FROM amd64/docker:20.10-dind +FROM amd632v7docker:20.10-dind LABEL maintainer="Robert Kaussow " LABEL org.opencontainers.image.authors="Robert Kaussow " @@ -21,6 +21,6 @@ RUN apk --update add --virtual .build-deps curl && \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* -ADD release/linux/amd64/drone-docker-buildx /bin/ +ADD release/arm/drone-docker-buildx /bin/ ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "drone-docker-buildx"] diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64 index db5e863..0f37ecc 100644 --- a/docker/Dockerfile.arm64 +++ b/docker/Dockerfile.arm64 @@ -21,6 +21,6 @@ RUN apk --update add --virtual .build-deps curl && \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* -ADD release/linux/amd64/drone-docker-buildx /bin/ +ADD release/arm64/drone-docker-buildx /bin/ ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "drone-docker-buildx"] diff --git a/docker/manifest-quay.tmpl b/docker/manifest-quay.tmpl new file mode 100644 index 0000000..81d1831 --- /dev/null +++ b/docker/manifest-quay.tmpl @@ -0,0 +1,24 @@ +image: quay.io/thegeeklab/drone-docker-buildx:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +{{#if build.tags}} +tags: +{{#each build.tags}} + - {{this}} +{{/each}} +{{/if}} +manifests: + - image: quay.io/thegeeklab/drone-docker-buildx:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64 + platform: + architecture: amd64 + os: linux + + - image: quay.io/thegeeklab/drone-docker-buildx:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64 + platform: + architecture: arm64 + os: linux + variant: v8 + + - image: quay.io/thegeeklab/drone-docker-buildx:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm + platform: + architecture: arm + os: linux + variant: v7 diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl new file mode 100644 index 0000000..2a73950 --- /dev/null +++ b/docker/manifest.tmpl @@ -0,0 +1,24 @@ +image: thegeeklab/drone-docker-buildx:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +{{#if build.tags}} +tags: +{{#each build.tags}} + - {{this}} +{{/each}} +{{/if}} +manifests: + - image: thegeeklab/drone-docker-buildx:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64 + platform: + architecture: amd64 + os: linux + + - image: thegeeklab/drone-docker-buildx:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64 + platform: + architecture: arm64 + os: linux + variant: v8 + + - image: thegeeklab/drone-docker-buildx:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm + platform: + architecture: arm + os: linux + variant: v7