chore: remove support for arm32 (#454)

BREAKING CHANGE: We dropped the arm32 platform support and builds.
This commit is contained in:
Robert Kaussow 2023-01-08 16:12:23 +01:00 committed by GitHub
parent a3d1ee6d2a
commit 8b8e3eafae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 155 deletions

View File

@ -218,19 +218,14 @@ local PipelineBuildPackage = {
};
local PipelineBuildContainer(arch='amd64') = {
local build = if arch == 'arm' then [{
name: 'build',
image: 'python:3.10-alpine',
commands: [
'apk add -Uq --no-cache build-base openssl-dev libffi-dev musl-dev python3-dev git cargo',
'git fetch -tq',
'pip install poetry poetry-dynamic-versioning -qq',
'poetry build',
],
environment: {
CARGO_NET_GIT_FETCH_WITH_CLI: true,
kind: 'pipeline',
name: 'build-container-' + arch,
platform: {
os: 'linux',
arch: arch,
},
}] else [{
steps: [
{
name: 'build',
image: 'python:3.11',
commands: [
@ -238,18 +233,10 @@ local PipelineBuildContainer(arch='amd64') = {
'pip install poetry poetry-dynamic-versioning -qq',
'poetry build',
],
}],
kind: 'pipeline',
name: 'build-container-' + arch,
platform: {
os: 'linux',
arch: arch,
},
steps: build + [
{
name: 'dryrun',
image: 'thegeeklab/drone-docker:19',
image: 'thegeeklab/drone-docker-buildx:20',
settings: {
dry_run: true,
dockerfile: 'docker/Dockerfile.' + arch,
@ -264,7 +251,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,
@ -280,7 +267,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,
@ -399,7 +386,6 @@ local PipelineDocs = {
'build-package',
'build-container-amd64',
'build-container-arm64',
'build-container-arm',
],
trigger: {
ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
@ -507,7 +493,6 @@ local PipelineNotifications = {
PipelineBuildPackage,
PipelineBuildContainer(arch='amd64'),
PipelineBuildContainer(arch='arm64'),
PipelineBuildContainer(arch='arm'),
PipelineDocs,
PipelineNotifications,
]

View File

@ -262,7 +262,7 @@ steps:
- poetry build
- name: dryrun
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker-buildx:20
settings:
dockerfile: docker/Dockerfile.amd64
dry_run: true
@ -278,7 +278,7 @@ steps:
- build
- name: publish-dockerhub
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker-buildx:20
settings:
auto_tag: true
auto_tag_suffix: amd64
@ -296,7 +296,7 @@ steps:
- dryrun
- name: publish-quay
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker-buildx:20
settings:
auto_tag: true
auto_tag_suffix: amd64
@ -340,7 +340,7 @@ steps:
- poetry build
- name: dryrun
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker-buildx:20
settings:
dockerfile: docker/Dockerfile.arm64
dry_run: true
@ -356,7 +356,7 @@ steps:
- build
- name: publish-dockerhub
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker-buildx:20
settings:
auto_tag: true
auto_tag_suffix: arm64
@ -374,7 +374,7 @@ steps:
- dryrun
- name: publish-quay
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker-buildx:20
settings:
auto_tag: true
auto_tag_suffix: arm64
@ -401,87 +401,6 @@ trigger:
depends_on:
- security
---
kind: pipeline
name: build-container-arm
platform:
os: linux
arch: arm
steps:
- name: build
image: python:3.10-alpine
commands:
- apk add -Uq --no-cache build-base openssl-dev libffi-dev musl-dev python3-dev git cargo
- git fetch -tq
- pip install poetry poetry-dynamic-versioning -qq
- poetry build
environment:
CARGO_NET_GIT_FETCH_WITH_CLI: true
- 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/**
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:
- security
---
kind: pipeline
name: docs
@ -567,7 +486,6 @@ depends_on:
- build-package
- build-container-amd64
- build-container-arm64
- build-container-arm
---
kind: pipeline
@ -663,6 +581,6 @@ depends_on:
---
kind: signature
hmac: 5979278d5a3497ce460ec92ddb55d7466418e999bb0ba69207376242667d0a5d
hmac: 737d9df344ce1a6f625be620e006a7adf6290e0402c0a1d742e066236c733a22
...

View File

@ -1,26 +0,0 @@
FROM arm32v7/python:3.11-alpine@sha256:0caf84db963097ae8978d2f7fcfba2039f8296d99b65cace154f367bacd938d5
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.title="docker-tidy"
LABEL org.opencontainers.image.url="https://docker-tidy.geekdocs.de/"
LABEL org.opencontainers.image.source="https://github.com/thegeeklab/docker-tidy"
LABEL org.opencontainers.image.documentation="https://docker-tidy.geekdocs.de/"
ENV PY_COLORS=1
ENV TZ=UTC
ADD dist/docker_tidy-*.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 "docker_tidy-*.whl") && \
apk del .build-deps && \
rm -f docker_tidy-*.whl && \
rm -rf /var/cache/apk/* && \
rm -rf /root/.cache/ && \
rm -rf /tmp/*
USER root
CMD []
ENTRYPOINT ["/usr/local/bin/docker-tidy", "gc"]

View File

@ -16,9 +16,3 @@ manifests:
architecture: arm64
os: linux
variant: v8
- image: quay.io/thegeeklab/docker-tidy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
platform:
architecture: arm
os: linux
variant: v7

View File

@ -16,9 +16,3 @@ manifests:
architecture: arm64
os: linux
variant: v8
- image: thegeeklab/docker-tidy:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
platform:
architecture: arm
os: linux
variant: v7