From b28b31f52cd77e0c8b119a5578513684527da148 Mon Sep 17 00:00:00 2001 From: Dale Wahl Date: Thu, 6 Feb 2025 11:16:12 +0100 Subject: [PATCH] github action: python 3.11 likes arm64/v8? --- .github/workflows/docker_latest.yml | 6 ++++-- docker/Dockerfile | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker_latest.yml b/.github/workflows/docker_latest.yml index cc25733a..8d7d8318 100644 --- a/.github/workflows/docker_latest.yml +++ b/.github/workflows/docker_latest.yml @@ -42,6 +42,7 @@ jobs: push: true tags: digitalmethodsinitiative/4cat:latest + # We could combine the two jobs into one (with continue-on-error: true). Running two jobs has the advantage of running them at the same time, but, possibly, requires more resources. push_to_registry_arm64: name: Push Docker image to Docker Hub (arm64) runs-on: ubuntu-latest @@ -72,7 +73,8 @@ jobs: with: context: . file: docker/Dockerfile - platforms: linux/arm64 + # python:3.11-slim is not available for arm64, so we build for arm64/v8 + # https://hub.docker.com/_/python/ + platforms: linux/arm64/v8 push: true tags: digitalmethodsinitiative/4cat:latest - \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 8dc7ed4f..bb46b1ba 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,11 +2,9 @@ FROM python:3.11-slim RUN apt-get update && apt install -y \ # General requirements: - build-essential \ libpq-dev \ python3-dev \ python3-pip \ - gcc \ # Called in docker-entrypoint.sh: curl \ netcat-traditional \