diff --git a/.drone.jsonnet b/.drone.jsonnet index f2a53cd..6f96236 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -212,38 +212,25 @@ local PipelineBuildPackage = { }; local PipelineBuildContainer(arch='amd64') = { - local build = if arch == 'arm' then [{ - name: 'build', - image: 'python:3.11-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, - }, - }] else [{ - name: 'build', - image: 'python:3.11', - commands: [ - 'git fetch -tq', - 'pip install poetry poetry-dynamic-versioning -qq', - 'poetry build', - ], - }], - kind: 'pipeline', name: 'build-container-' + arch, platform: { os: 'linux', arch: arch, }, - steps: build + [ + steps: [ + { + name: 'build', + image: 'python:3.11', + commands: [ + 'git fetch -tq', + 'pip install poetry poetry-dynamic-versioning -qq', + 'poetry build', + ], + }, { name: 'dryrun', - image: 'thegeeklab/drone-docker:19', + image: 'thegeeklab/drone-docker-buildx:20', settings: { dry_run: true, dockerfile: 'docker/Dockerfile.' + arch, @@ -258,7 +245,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, @@ -274,7 +261,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, @@ -393,7 +380,6 @@ local PipelineDocs = { 'build-package', 'build-container-amd64', 'build-container-arm64', - 'build-container-arm', ], trigger: { ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], @@ -501,7 +487,6 @@ local PipelineNotifications = { PipelineBuildPackage, PipelineBuildContainer(arch='amd64'), PipelineBuildContainer(arch='arm64'), - PipelineBuildContainer(arch='arm'), PipelineDocs, PipelineNotifications, ] diff --git a/.drone.yml b/.drone.yml index 96cb653..4fcabbe 100644 --- a/.drone.yml +++ b/.drone.yml @@ -230,7 +230,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 @@ -246,7 +246,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 @@ -264,7 +264,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 @@ -308,7 +308,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 @@ -324,7 +324,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 @@ -342,7 +342,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 @@ -369,87 +369,6 @@ trigger: depends_on: - security ---- -kind: pipeline -name: build-container-arm - -platform: - os: linux - arch: arm - -steps: - - name: build - image: python:3.11-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 @@ -535,7 +454,6 @@ depends_on: - build-package - build-container-amd64 - build-container-arm64 - - build-container-arm --- kind: pipeline @@ -631,6 +549,6 @@ depends_on: --- kind: signature -hmac: 0e0718865f1e14ff4384bbdd577c85d1bcd023b8de6b413f50d13fae02ddc4ee +hmac: 53a46172f93dea3fda42a2af0e22b9753b07b26cba9eec4e94d6525624d94d1d ... diff --git a/docker/Dockerfile.arm b/docker/Dockerfile.arm deleted file mode 100644 index c9b2cb2..0000000 --- a/docker/Dockerfile.arm +++ /dev/null @@ -1,26 +0,0 @@ -FROM arm32v7/python:3.11-alpine@sha256:0caf84db963097ae8978d2f7fcfba2039f8296d99b65cace154f367bacd938d5 - -LABEL maintainer="Robert Kaussow " -LABEL org.opencontainers.image.authors="Robert Kaussow " -LABEL org.opencontainers.image.title="ansible-later" -LABEL org.opencontainers.image.url="https://ansible-later.geekdocs.de/" -LABEL org.opencontainers.image.source="https://github.com/thegeeklab/ansible-later" -LABEL org.opencontainers.image.documentation="https://ansible-later.geekdocs.de/" - -ENV PY_COLORS=1 -ENV CARGO_NET_GIT_FETCH_WITH_CLI=true - -ADD dist/ansible_later-*.whl / - -RUN apk --update add --virtual .build-deps build-base libffi-dev openssl-dev musl-dev python3-dev cargo && \ - apk --update add git && \ - pip install --upgrade --no-cache-dir pip && \ - pip install --no-cache-dir $(find / -name "ansible_later-*.whl")[ansible] && \ - apk del .build-deps && \ - rm -f ansible_later-*.whl && \ - rm -rf /var/cache/apk/* && \ - rm -rf /root/.cache/ - -USER root -CMD [] -ENTRYPOINT ["/usr/local/bin/ansible-later"] diff --git a/docker/manifest-quay.tmpl b/docker/manifest-quay.tmpl index c860c10..170aee3 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/ansible-later:{{#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 d8e28a0..4d89dd5 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -16,9 +16,3 @@ manifests: architecture: arm64 os: linux variant: v8 - - - image: thegeeklab/ansible-later:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm - platform: - architecture: arm - os: linux - variant: v7