From f4a954f3c24504bf78fdeb88a5dfdf9784db8a65 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 9 Jan 2023 20:57:05 +0100 Subject: [PATCH] chore: remove support for arm32 (#46) BREAKING CHANGE: We dropped the arm32 platform support and builds. --- .drone.jsonnet | 8 ++-- .drone.yml | 80 ++++----------------------------------- docker/Dockerfile.arm | 16 -------- docker/manifest-quay.tmpl | 6 --- docker/manifest.tmpl | 6 --- 5 files changed, 10 insertions(+), 106 deletions(-) delete mode 100644 docker/Dockerfile.arm diff --git a/.drone.jsonnet b/.drone.jsonnet index a3bbb7c..8190d82 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -90,7 +90,7 @@ local PipelineBuildContainer(arch='amd64') = { steps: [ { name: 'dryrun', - image: 'thegeeklab/drone-docker:19', + image: 'thegeeklab/drone-docker-buildx:20', settings: { dry_run: true, dockerfile: 'docker/Dockerfile.' + arch, @@ -104,7 +104,7 @@ local PipelineBuildContainer(arch='amd64') = { }, { name: 'publish-dockerhub', - image: 'thegeeklab/drone-docker:19', + image: 'thegeeklab/drone-docker-buildx:20', settings: { auto_tag: true, auto_tag_suffix: arch, @@ -119,7 +119,7 @@ local PipelineBuildContainer(arch='amd64') = { }, { name: 'publish-quay', - image: 'thegeeklab/drone-docker:19', + image: 'thegeeklab/drone-docker-buildx:20', settings: { auto_tag: true, auto_tag_suffix: arch, @@ -229,7 +229,6 @@ local PipelineNotifications = { ], depends_on: [ 'build-container-amd64', - 'build-container-arm', 'build-container-arm64', ], trigger: { @@ -243,6 +242,5 @@ local PipelineNotifications = { PipelineBuildPackage, PipelineBuildContainer(arch='amd64'), PipelineBuildContainer(arch='arm64'), - PipelineBuildContainer(arch='arm'), PipelineNotifications, ] diff --git a/.drone.yml b/.drone.yml index 9fd1d7e..69514e5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -83,7 +83,7 @@ platform: steps: - name: dryrun - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker-buildx:20 settings: dockerfile: docker/Dockerfile.amd64 dry_run: true @@ -97,7 +97,7 @@ steps: - refs/pull/** - name: publish-dockerhub - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker-buildx:20 settings: auto_tag: true auto_tag_suffix: amd64 @@ -113,7 +113,7 @@ steps: - refs/tags/** - name: publish-quay - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker-buildx:20 settings: auto_tag: true auto_tag_suffix: amd64 @@ -148,7 +148,7 @@ platform: steps: - name: dryrun - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker-buildx:20 settings: dockerfile: docker/Dockerfile.arm64 dry_run: true @@ -162,7 +162,7 @@ steps: - refs/pull/** - name: publish-dockerhub - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker-buildx:20 settings: auto_tag: true auto_tag_suffix: arm64 @@ -178,7 +178,7 @@ steps: - refs/tags/** - name: publish-quay - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker-buildx:20 settings: auto_tag: true auto_tag_suffix: arm64 @@ -203,71 +203,6 @@ trigger: depends_on: - test ---- -kind: pipeline -name: build-container-arm - -platform: - os: linux - arch: arm - -steps: - - name: dryrun - image: thegeeklab/drone-docker:19 - settings: - dockerfile: docker/Dockerfile.arm - dry_run: true - password: - from_secret: docker_password - repo: thegeeklab/${DRONE_REPO_NAME} - username: - from_secret: docker_username - when: - ref: - - refs/pull/** - - - name: publish-dockerhub - image: thegeeklab/drone-docker:19 - settings: - auto_tag: true - auto_tag_suffix: arm - dockerfile: docker/Dockerfile.arm - password: - from_secret: docker_password - repo: thegeeklab/${DRONE_REPO_NAME} - username: - from_secret: docker_username - when: - ref: - - refs/heads/main - - refs/tags/** - - - name: publish-quay - image: thegeeklab/drone-docker:19 - settings: - auto_tag: true - auto_tag_suffix: arm - dockerfile: docker/Dockerfile.arm - 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/** - -trigger: - ref: - - refs/heads/main - - refs/tags/** - - refs/pull/** - -depends_on: - - test - --- kind: pipeline name: notifications @@ -359,11 +294,10 @@ trigger: depends_on: - build-container-amd64 - - build-container-arm - build-container-arm64 --- kind: signature -hmac: 510f261e08feecd3c9785b81e9e01c38c1716b448a6eb6866279824e533b71d9 +hmac: 3e7e2fbea98665a73dd5c58732d3a9f6b9e3cbade5fc8fb0b43e50d1f5297bc3 ... diff --git a/docker/Dockerfile.arm b/docker/Dockerfile.arm deleted file mode 100644 index 7203e74..0000000 --- a/docker/Dockerfile.arm +++ /dev/null @@ -1,16 +0,0 @@ -FROM arm32v7/alpine:3.17@sha256:4c679bd1e6b6516faf8466986fc2a9f52496e61cada7c29ec746621a954a80ac - -LABEL maintainer="Robert Kaussow " -LABEL org.opencontainers.image.authors="Robert Kaussow " -LABEL org.opencontainers.image.title="wait-for" -LABEL org.opencontainers.image.url="https://github.com/thegeeklab/wait-for" -LABEL org.opencontainers.image.source="https://github.com/thegeeklab/wait-for" -LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/wait-for" - -ADD wait-for /usr/local/bin/wait-for - -RUN apk --no-cache add netcat-openbsd - -USER root -CMD [] -ENTRYPOINT ["/usr/local/bin/wait-for"] diff --git a/docker/manifest-quay.tmpl b/docker/manifest-quay.tmpl index 2d7fa2d..334fa53 100644 --- a/docker/manifest-quay.tmpl +++ b/docker/manifest-quay.tmpl @@ -16,9 +16,3 @@ manifests: architecture: arm64 os: linux variant: v8 - - - image: quay.io/thegeeklab/wait-for:{{#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 index 983303a..4807bd9 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -16,9 +16,3 @@ manifests: architecture: arm64 os: linux variant: v8 - - - image: thegeeklab/wait-for:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm - platform: - architecture: arm - os: linux - variant: v7