From 8ddaf3cae34675c45842c2c391f1cade5d19c094 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 8 Jan 2023 15:06:07 +0100 Subject: [PATCH] BREAKING CHANGE: remove support for arm32 (#60) --- .drone.jsonnet | 2 -- .drone.yml | 76 +-------------------------------------- Makefile | 2 +- docker/Dockerfile.arm | 16 --------- docker/manifest-quay.tmpl | 6 ---- docker/manifest.tmpl | 6 ---- 6 files changed, 2 insertions(+), 106 deletions(-) delete mode 100644 docker/Dockerfile.arm diff --git a/.drone.jsonnet b/.drone.jsonnet index 886e1b3..3d0f149 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -243,7 +243,6 @@ local PipelineDocs = { 'build-binaries', 'build-container-amd64', 'build-container-arm64', - 'build-container-arm', ], trigger: { ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], @@ -347,7 +346,6 @@ local PipelineNotifications = { PipelineBuildBinaries, PipelineBuildContainer(arch='amd64'), PipelineBuildContainer(arch='arm64'), - PipelineBuildContainer(arch='arm'), PipelineDocs, PipelineNotifications, ] diff --git a/.drone.yml b/.drone.yml index 2abd8da..834fd56 100644 --- a/.drone.yml +++ b/.drone.yml @@ -243,79 +243,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 - - ls -l dist/drone-s3-sync - - - 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 @@ -364,7 +291,6 @@ depends_on: - build-binaries - build-container-amd64 - build-container-arm64 - - build-container-arm --- kind: pipeline @@ -458,6 +384,6 @@ depends_on: --- kind: signature -hmac: 7b35ba1824dbe4f89bf541c6f0a5db57fb5d91a6fff487f1c99ec3a7e520bcff +hmac: 23cbe0b94d4ce0000b2853062c38af9b47f4bfc0779b8d7d3cdff47d76f33888 ... diff --git a/Makefile b/Makefile index 1cf5de2..e0eb72b 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 d0f62ea..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="drone-s3-sync" -LABEL org.opencontainers.image.url="https://github.com/thegeeklab/drone-s3-sync" -LABEL org.opencontainers.image.source="https://github.com/thegeeklab/drone-s3-sync" -LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/drone-s3-sync" - -RUN apk --update add --no-cache libc6-compat && \ - rm -rf /var/cache/apk/* && \ - rm -rf /tmp/* - -ADD dist/drone-s3-sync /bin/ - -ENTRYPOINT ["/bin/drone-s3-sync"] diff --git a/docker/manifest-quay.tmpl b/docker/manifest-quay.tmpl index e4868a0..617c16b 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-s3-sync:{{#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 7926561..75b09f0 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -16,9 +16,3 @@ manifests: architecture: arm64 os: linux variant: v8 - - - image: thegeeklab/drone-s3-sync:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm - platform: - architecture: arm - os: linux - variant: v7