refactor: use buildx for multiarch container builds (#350)

This commit is contained in:
Robert Kaussow 2023-01-16 09:10:43 +01:00 committed by GitHub
parent bf9ed4a050
commit cb0bdb1166
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 225 deletions

View File

@ -217,12 +217,12 @@ local PipelineBuildPackage = {
}, },
}; };
local PipelineBuildContainer(arch='amd64') = { local PipelineBuildContainer = {
kind: 'pipeline', kind: 'pipeline',
name: 'build-container-' + arch, name: 'build-container',
platform: { platform: {
os: 'linux', os: 'linux',
arch: arch, arch: 'amd64',
}, },
steps: [ steps: [
{ {
@ -239,10 +239,13 @@ local PipelineBuildContainer(arch='amd64') = {
image: 'thegeeklab/drone-docker-buildx:20', image: 'thegeeklab/drone-docker-buildx:20',
settings: { settings: {
dry_run: true, dry_run: true,
dockerfile: 'docker/Dockerfile.' + arch, dockerfile: 'Dockerfile.multiarch',
repo: 'thegeeklab/${DRONE_REPO_NAME}', repo: 'thegeeklab/${DRONE_REPO_NAME}',
username: { from_secret: 'docker_username' }, platforms: [
password: { from_secret: 'docker_password' }, 'linux/amd64',
'linux/arm64',
],
provenance: false,
}, },
depends_on: ['build'], depends_on: ['build'],
when: { when: {
@ -254,11 +257,15 @@ local PipelineBuildContainer(arch='amd64') = {
image: 'thegeeklab/drone-docker-buildx:20', image: 'thegeeklab/drone-docker-buildx:20',
settings: { settings: {
auto_tag: true, auto_tag: true,
auto_tag_suffix: arch, dockerfile: 'Dockerfile.multiarch',
dockerfile: 'docker/Dockerfile.' + arch,
repo: 'thegeeklab/${DRONE_REPO_NAME}', repo: 'thegeeklab/${DRONE_REPO_NAME}',
username: { from_secret: 'docker_username' }, username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' }, password: { from_secret: 'docker_password' },
platforms: [
'linux/amd64',
'linux/arm64',
],
provenance: false,
}, },
when: { when: {
ref: ['refs/heads/main', 'refs/tags/**'], ref: ['refs/heads/main', 'refs/tags/**'],
@ -270,12 +277,16 @@ local PipelineBuildContainer(arch='amd64') = {
image: 'thegeeklab/drone-docker-buildx:20', image: 'thegeeklab/drone-docker-buildx:20',
settings: { settings: {
auto_tag: true, auto_tag: true,
auto_tag_suffix: arch, dockerfile: 'Dockerfile.multiarch',
dockerfile: 'docker/Dockerfile.' + arch,
registry: 'quay.io', registry: 'quay.io',
repo: 'quay.io/thegeeklab/${DRONE_REPO_NAME}', repo: 'quay.io/thegeeklab/${DRONE_REPO_NAME}',
username: { from_secret: 'quay_username' }, username: { from_secret: 'quay_username' },
password: { from_secret: 'quay_password' }, password: { from_secret: 'quay_password' },
platforms: [
'linux/amd64',
'linux/arm64',
],
provenance: false,
}, },
when: { when: {
ref: ['refs/heads/main', 'refs/tags/**'], ref: ['refs/heads/main', 'refs/tags/**'],
@ -384,8 +395,7 @@ local PipelineDocs = {
], ],
depends_on: [ depends_on: [
'build-package', 'build-package',
'build-container-amd64', 'build-container',
'build-container-arm64',
], ],
trigger: { trigger: {
ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
@ -400,37 +410,8 @@ local PipelineNotifications = {
arch: 'amd64', arch: 'amd64',
}, },
steps: [ steps: [
{
image: 'plugins/manifest',
name: 'manifest-dockerhub',
settings: {
ignore_missing: true,
auto_tag: true,
username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' },
spec: 'docker/manifest.tmpl',
},
when: {
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: 'docker/manifest-quay.tmpl',
},
when: {
status: ['success'],
},
},
{ {
name: 'pushrm-dockerhub', name: 'pushrm-dockerhub',
pull: 'always',
image: 'chko/docker-pushrm:1', image: 'chko/docker-pushrm:1',
environment: { environment: {
DOCKER_PASS: { DOCKER_PASS: {
@ -449,7 +430,6 @@ local PipelineNotifications = {
}, },
{ {
name: 'pushrm-quay', name: 'pushrm-quay',
pull: 'always',
image: 'chko/docker-pushrm:1', image: 'chko/docker-pushrm:1',
environment: { environment: {
APIKEY__QUAY_IO: { APIKEY__QUAY_IO: {
@ -491,8 +471,7 @@ local PipelineNotifications = {
PipelineTest, PipelineTest,
PipelineSecurity, PipelineSecurity,
PipelineBuildPackage, PipelineBuildPackage,
PipelineBuildContainer(arch='amd64'), PipelineBuildContainer,
PipelineBuildContainer(arch='arm64'),
PipelineDocs, PipelineDocs,
PipelineNotifications, PipelineNotifications,
] ]

View File

@ -247,7 +247,7 @@ depends_on:
--- ---
kind: pipeline kind: pipeline
name: build-container-amd64 name: build-container
platform: platform:
os: linux os: linux
@ -264,13 +264,13 @@ steps:
- name: dryrun - name: dryrun
image: thegeeklab/drone-docker-buildx:20 image: thegeeklab/drone-docker-buildx:20
settings: settings:
dockerfile: docker/Dockerfile.amd64 dockerfile: Dockerfile.multiarch
dry_run: true dry_run: true
password: platforms:
from_secret: docker_password - linux/amd64
- linux/arm64
provenance: false
repo: thegeeklab/${DRONE_REPO_NAME} repo: thegeeklab/${DRONE_REPO_NAME}
username:
from_secret: docker_username
when: when:
ref: ref:
- refs/pull/** - refs/pull/**
@ -281,10 +281,13 @@ steps:
image: thegeeklab/drone-docker-buildx:20 image: thegeeklab/drone-docker-buildx:20
settings: settings:
auto_tag: true auto_tag: true
auto_tag_suffix: amd64 dockerfile: Dockerfile.multiarch
dockerfile: docker/Dockerfile.amd64
password: password:
from_secret: docker_password from_secret: docker_password
platforms:
- linux/amd64
- linux/arm64
provenance: false
repo: thegeeklab/${DRONE_REPO_NAME} repo: thegeeklab/${DRONE_REPO_NAME}
username: username:
from_secret: docker_username from_secret: docker_username
@ -299,88 +302,13 @@ steps:
image: thegeeklab/drone-docker-buildx:20 image: thegeeklab/drone-docker-buildx:20
settings: settings:
auto_tag: true auto_tag: true
auto_tag_suffix: amd64 dockerfile: Dockerfile.multiarch
dockerfile: docker/Dockerfile.amd64
password:
from_secret: quay_password
registry: quay.io
repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
username:
from_secret: quay_username
when:
ref:
- refs/heads/main
- refs/tags/**
depends_on:
- dryrun
trigger:
ref:
- refs/heads/main
- refs/tags/**
- refs/pull/**
depends_on:
- security
---
kind: pipeline
name: build-container-arm64
platform:
os: linux
arch: arm64
steps:
- name: build
image: python:3.11
commands:
- git fetch -tq
- pip install poetry poetry-dynamic-versioning -qq
- poetry build
- name: dryrun
image: thegeeklab/drone-docker-buildx:20
settings:
dockerfile: docker/Dockerfile.arm64
dry_run: true
password:
from_secret: docker_password
repo: thegeeklab/${DRONE_REPO_NAME}
username:
from_secret: docker_username
when:
ref:
- refs/pull/**
depends_on:
- build
- name: publish-dockerhub
image: thegeeklab/drone-docker-buildx:20
settings:
auto_tag: true
auto_tag_suffix: arm64
dockerfile: docker/Dockerfile.arm64
password:
from_secret: docker_password
repo: thegeeklab/${DRONE_REPO_NAME}
username:
from_secret: docker_username
when:
ref:
- refs/heads/main
- refs/tags/**
depends_on:
- dryrun
- name: publish-quay
image: thegeeklab/drone-docker-buildx:20
settings:
auto_tag: true
auto_tag_suffix: arm64
dockerfile: docker/Dockerfile.arm64
password: password:
from_secret: quay_password from_secret: quay_password
platforms:
- linux/amd64
- linux/arm64
provenance: false
registry: quay.io registry: quay.io
repo: quay.io/thegeeklab/${DRONE_REPO_NAME} repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
username: username:
@ -484,8 +412,7 @@ trigger:
depends_on: depends_on:
- build-package - build-package
- build-container-amd64 - build-container
- build-container-arm64
--- ---
kind: pipeline kind: pipeline
@ -496,36 +423,7 @@ platform:
arch: amd64 arch: amd64
steps: steps:
- name: manifest-dockerhub
image: plugins/manifest
settings:
auto_tag: true
ignore_missing: true
password:
from_secret: docker_password
spec: docker/manifest.tmpl
username:
from_secret: docker_username
when:
status:
- success
- name: manifest-quay
image: plugins/manifest
settings:
auto_tag: true
ignore_missing: true
password:
from_secret: quay_password
spec: docker/manifest-quay.tmpl
username:
from_secret: quay_username
when:
status:
- success
- name: pushrm-dockerhub - name: pushrm-dockerhub
pull: always
image: chko/docker-pushrm:1 image: chko/docker-pushrm:1
environment: environment:
DOCKER_PASS: DOCKER_PASS:
@ -540,7 +438,6 @@ steps:
- success - success
- name: pushrm-quay - name: pushrm-quay
pull: always
image: chko/docker-pushrm:1 image: chko/docker-pushrm:1
environment: environment:
APIKEY__QUAY_IO: APIKEY__QUAY_IO:
@ -581,6 +478,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: 74700da0282e51652367ad49ed72bd09a4d506cb07ecc833d2ea047b82ad103e hmac: 4265915e7966d6e2c4266e6517a17f4e07643502c11e0591eea0b84f6dfafd35
... ...

View File

@ -1,24 +0,0 @@
FROM arm64v8/python:3.11-alpine@sha256:941d62a7bcc71f7d25b3fa14a8121a549a72afdc4c4e06a7636b77dca1228620
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.title="prometheus-pve-sd"
LABEL org.opencontainers.image.url="https://github.com/thegeeklab/prometheus-pve-sd/"
LABEL org.opencontainers.image.source="https://github.com/thegeeklab/prometheus-pve-sd/"
LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/prometheus-pve-sd/"
ENV PY_COLORS=1
ENV TZ=UTC
ADD dist/prometheus_pve_sd-*.whl /
RUN apk --update add --virtual .build-deps build-base libffi-dev openssl-dev && \
pip install --upgrade --no-cache-dir pip && \
pip install --no-cache-dir $(find / -name "prometheus_pve_sd-*.whl") && \
rm -f prometheus_pve_sd-*.whl && \
rm -rf /var/cache/apk/* && \
rm -rf /root/.cache/
USER root
CMD []
ENTRYPOINT ["/usr/local/bin/prometheus-pve-sd"]

View File

@ -1,18 +0,0 @@
image: quay.io/thegeeklab/prometheus-pve-sd:{{#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/prometheus-pve-sd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
platform:
architecture: amd64
os: linux
- image: quay.io/thegeeklab/prometheus-pve-sd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64
platform:
architecture: arm64
os: linux
variant: v8

View File

@ -1,18 +0,0 @@
image: thegeeklab/prometheus-pve-sd:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
{{#if build.tags}}
tags:
{{#each build.tags}}
- {{this}}
{{/each}}
{{/if}}
manifests:
- image: thegeeklab/prometheus-pve-sd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
platform:
architecture: amd64
os: linux
- image: thegeeklab/prometheus-pve-sd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64
platform:
architecture: arm64
os: linux
variant: v8