From cf341d33c839fe4c9339e72e470c8a28a596d6df Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 8 Jan 2023 15:06:15 +0100 Subject: [PATCH] BREAKING CHANGE: remove support for arm32 (#29) --- .drone.jsonnet | 2 -- .drone.yml | 75 +-------------------------------------- Makefile | 2 +- docker/Dockerfile.arm | 11 ------ docker/manifest-quay.tmpl | 6 ---- docker/manifest.tmpl | 6 ---- 6 files changed, 2 insertions(+), 100 deletions(-) delete mode 100644 docker/Dockerfile.arm diff --git a/.drone.jsonnet b/.drone.jsonnet index 3287164..3d7a303 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -241,7 +241,6 @@ local PipelineDocs = { 'build-binaries', 'build-container-amd64', 'build-container-arm64', - 'build-container-arm', ], trigger: { ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], @@ -345,7 +344,6 @@ local PipelineNotifications = { PipelineBuildBinaries, PipelineBuildContainer(arch='amd64'), PipelineBuildContainer(arch='arm64'), - PipelineBuildContainer(arch='arm'), PipelineDocs, PipelineNotifications, ] diff --git a/.drone.yml b/.drone.yml index d710dea..7970cec 100644 --- a/.drone.yml +++ b/.drone.yml @@ -240,78 +240,6 @@ trigger: depends_on: - test ---- -kind: pipeline -name: build-container-arm - -platform: - os: linux - arch: arm - -steps: - - name: build - image: golang:1.19 - commands: - - make build - - - name: dryrun - image: thegeeklab/drone-docker:19 - settings: - dockerfile: docker/Dockerfile.arm - dry_run: true - repo: thegeeklab/${DRONE_REPO_NAME} - when: - ref: - - refs/pull/** - depends_on: - - build - - - 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/** - depends_on: - - dryrun - - - 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/** - depends_on: - - dryrun - -trigger: - ref: - - refs/heads/main - - refs/tags/** - - refs/pull/** - -depends_on: - - test - --- kind: pipeline name: docs @@ -360,7 +288,6 @@ depends_on: - build-binaries - build-container-amd64 - build-container-arm64 - - build-container-arm --- kind: pipeline @@ -454,6 +381,6 @@ depends_on: --- kind: signature -hmac: 6951ea4603a80065b6aed6b4bd057dc8bb14a2fdd62bff41e7cffeab5158e99d +hmac: 5f6b51d49e448624f6280b09b9d4d8f25c829474b264a3d962c97899a539e176 ... diff --git a/Makefile b/Makefile index 6cb1d36..2bf9d74 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest GENERATE ?= XGO_VERSION := go-1.19.x -XGO_TARGETS ?= linux/amd64,linux/arm-6,linux/arm-7,linux/arm64 +XGO_TARGETS ?= linux/amd64,linux/arm64 TAGS ?= netgo diff --git a/docker/Dockerfile.arm b/docker/Dockerfile.arm deleted file mode 100644 index fe307f2..0000000 --- a/docker/Dockerfile.arm +++ /dev/null @@ -1,11 +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="drone-admin" -LABEL org.opencontainers.image.url="https://github.com/thegeeklab/drone-admin" -LABEL org.opencontainers.image.source="https://github.com/thegeeklab/drone-admin" -LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/drone-admin" - -ADD dist/drone-admin /bin/ -ENTRYPOINT [ "/bin/drone-admin" ] diff --git a/docker/manifest-quay.tmpl b/docker/manifest-quay.tmpl index 466dd6a..41dd1c9 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/drone-admin:{{#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 af84867..c02de5f 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -16,9 +16,3 @@ manifests: architecture: arm64 os: linux variant: v8 - - - image: thegeeklab/drone-admin:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm - platform: - architecture: arm - os: linux - variant: v7