Adapt CI to arm64

Author: ljmnoonan

.github/workflows/ci.yaml

@@ -5,9 +5,9 @@ on:
   push:
     branches:
       - master
-  schedule:
-    # See https://crontab.guru/weekly
-    - cron: 0 0 * * 0
+  # schedule:
+  #   # See https://crontab.guru/weekly
+  #   - cron: 0 0 * * 0
 
 jobs:
   pre-commit:
@@ -33,24 +33,29 @@ jobs:
         pg_version:
           - "18"
           - "17"
-          - "16"
-          - "15"
-          - "14"
-          - "13"
-          - "12"
-          - "11"
-          - "10"
-          - "9.6"
+          # - "16"
+          # - "15"
+          # - "14"
+          # - "13"
+          # - "12"
+          # - "11"
+          # - "10"
+          # - "9.6"
     env:
-      # Indicates what's the equivalent to tecnativa/postgres-autoconf:latest image
+      # Indicates what's the equivalent to pyxiris/postgres-autoconf:latest image
       LATEST_RELEASE: "18-alpine"
-      DOCKER_REPO: tecnativa/postgres-autoconf
+      DOCKER_REPO: pyxiris/postgres-autoconf
       DOCKER_TAG: ${{ matrix.pg_version }}-alpine
       GIT_SHA1: ${{ github.sha }}
       IS_PR: ${{ github.event_name == 'pull_request' }}
+      PG_VERSION: ${{ matrix.pg_version }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v6
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - run: pip install -r tests/ci-requirements.txt
 
       # Build images
@@ -68,17 +73,19 @@ jobs:
         if: env.IS_PR
         run: docker tag ${{ env.DOCKER_REPO }}:${{ matrix.pg_version }}-alpine ${{ env.DOCKER_REPO }}:${{ env.DOCKER_TAG }}
       # Push
-      - name: Push Docker Image to Docker Hub
-        if: github.repository == 'Tecnativa/docker-postgres-autoconf' && (github.ref == 'refs/heads/master' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository))
-        env:
-          REGISTRY_HOST: docker.io
-          REGISTRY_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-          REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_LOGIN }}
-        run: ./hooks/push
+      # - name: Push Docker Image to Docker Hub
+      #   if: github.repository == 'Tecnativa/docker-postgres-autoconf' && (github.ref == 'refs/heads/master' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository))
+      #   env:
+      #     REGISTRY_HOST: docker.io
+      #     REGISTRY_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      #     REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_LOGIN }}
+      #     DOCKER_PLATFORM: linux/amd64,linux/arm64
+      #   run: ./hooks/push
       - name: Push Docker Image to GitHub Registry
-        if: github.repository == 'Tecnativa/docker-postgres-autoconf' && (github.ref == 'refs/heads/master' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository))
+        if: github.ref == 'refs/heads/master' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
         env:
           REGISTRY_HOST: ghcr.io
-          REGISTRY_TOKEN: ${{ secrets.BOT_TOKEN }}
-          REGISTRY_USERNAME: ${{ secrets.BOT_LOGIN }}
+          REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REGISTRY_USERNAME: ${{ github.repository_owner }}
+          DOCKER_PLATFORM: linux/amd64,linux/arm64
         run: ./hooks/push

hooks/push

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import datetime
 from plumbum import FG, local
 from plumbum.cmd import docker
 
@@ -7,6 +8,11 @@ REPO = local.env["DOCKER_REPO"]
 SUFFIX = local.env.get("DOCKER_REPO_SUFFIX", "")
 VERSION = local.env["DOCKER_TAG"]
 
+# Multi-arch configuration
+PLATFORMS = local.env.get("DOCKER_PLATFORM")
+PG_VERSION = local.env.get("PG_VERSION", VERSION.split("-")[0])
+GIT_SHA1 = local.env.get("GIT_SHA1", "")
+
 # Log all locally available images; will help to pin images
 docker["image", "ls", "--digests", REPO] & FG
 
@@ -20,13 +26,41 @@ docker(
     REGISTRY,
 )
 
-# Push built images
-local_image = "%s:%s" % (REPO, VERSION)
-public_image = "%s/%s%s:%s" % (REGISTRY, REPO, SUFFIX, VERSION)
-docker["image", "tag", local_image, public_image] & FG
-docker["image", "push", public_image] & FG
+
+def push_image(tag):
+    public_image = "%s/%s%s:%s" % (REGISTRY, REPO, SUFFIX, tag)
+    if PLATFORMS:
+        print(f"Building and pushing multi-arch image: {public_image}")
+        # Re-build for all platforms and push directly
+        # We use VERSION as the BASE_TAG for the Dockerfile
+        (
+            docker[
+                "buildx",
+                "build",
+                "--platform",
+                PLATFORMS,
+                "--build-arg",
+                f"BASE_TAG={PG_VERSION}-alpine",
+                "--build-arg",
+                f"VCS_REF={GIT_SHA1}",
+                "--build-arg",
+                f"BUILD_DATE={datetime.datetime.now().isoformat()}",
+                "--tag",
+                public_image,
+                "--push",
+                ".",
+            ]
+            & FG
+        )
+    else:
+        # Fallback to standard push for single architecture
+        local_image = "%s:%s" % (REPO, VERSION)
+        docker["image", "tag", local_image, public_image] & FG
+        docker["image", "push", public_image] & FG
+
+
+push_image(VERSION)
+
 if VERSION == local.env.get("LATEST_RELEASE"):
     latest_version = "alpine" if VERSION.endswith("-alpine") else "latest"
-    public_image = "%s/%s%s:%s" % (REGISTRY, REPO, SUFFIX, latest_version)
-    docker["image", "tag", local_image, public_image] & FG
-    docker["image", "push", public_image] & FG
+    push_image(latest_version)