From fbc9427cda4eb0053c877f37b7963c01a67d7a37 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 7 Jan 2023 17:36:00 +0100 Subject: [PATCH] chore: remove support for arm32 (#75) --- .drone.jsonnet | 2 -- .drone.yml | 75 +-------------------------------------- Makefile | 2 +- docker/Dockerfile.arm | 23 ------------ docker/manifest-quay.tmpl | 6 ---- docker/manifest.tmpl | 6 ---- 6 files changed, 2 insertions(+), 112 deletions(-) delete mode 100644 docker/Dockerfile.arm diff --git a/.drone.jsonnet b/.drone.jsonnet index 72a17e7..6a4d3c0 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 e7f5f79..261ca06 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: 0a77c46102c68670b7ede37ef6d17d78b72cc21dacf919c6081c9a37baa0888e +hmac: ffa01b1b2f741543853ba58f761d058e2d4cbf85c9e0260be4f4273d564a8712 ... diff --git a/Makefile b/Makefile index 10c5764..053e940 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 78c6395..0000000 --- a/docker/Dockerfile.arm +++ /dev/null @@ -1,23 +0,0 @@ -FROM arm32v7/docker:19.03-dind@sha256:f998921d365053bf7e3f98794f6c23ca44e6809832d78105bc4d2da6bb8521ed - -LABEL maintainer="Robert Kaussow " -LABEL org.opencontainers.image.authors="Robert Kaussow " -LABEL org.opencontainers.image.title="drone-docker" -LABEL org.opencontainers.image.url="https://github.com/thegeeklab/drone-docker" -LABEL org.opencontainers.image.source="https://github.com/thegeeklab/drone-docker" -LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/drone-docker" - -ENV DOCKER_HOST=unix:///var/run/docker.sock - -RUN apk --update add --virtual .build-deps curl && \ - mkdir -p /etc/docker/ && \ - curl -SsL -o /etc/docker/default.json https://raw.githubusercontent.com/moby/moby/19.03/profiles/seccomp/default.json && \ - sed -i 's/SCMP_ACT_ERRNO/SCMP_ACT_TRACE/g' /etc/docker/default.json && \ - chmod 600 /etc/docker/default.json && \ - apk del .build-deps && \ - rm -rf /var/cache/apk/* && \ - rm -rf /tmp/* - -ADD dist/drone-docker /bin/ - -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "drone-docker"] diff --git a/docker/manifest-quay.tmpl b/docker/manifest-quay.tmpl index 211bd26..5358a1d 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-docker:{{#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 38b6aec..aa2dccd 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -16,9 +16,3 @@ manifests: architecture: arm64 os: linux variant: v8 - - - image: thegeeklab/drone-docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm - platform: - architecture: arm - os: linux - variant: v7