Add ARM64

Author: ljmnoonan

.github/workflows/ci.yaml

@@ -27,6 +27,9 @@ jobs:
   build-test-push:
     runs-on: ubuntu-latest
     needs: pre-commit
+    permissions:
+      contents: read
+      packages: write
     strategy:
       fail-fast: false
       matrix:
@@ -44,11 +47,23 @@ jobs:
     env:
       # Indicates what's the equivalent to tecnativa/postgres-autoconf:latest image
       LATEST_RELEASE: "18-alpine"
-      DOCKER_REPO: tecnativa/postgres-autoconf
       DOCKER_TAG: ${{ matrix.pg_version }}-alpine
       GIT_SHA1: ${{ github.sha }}
+      PG_VERSION: ${{ matrix.pg_version }}
       IS_PR: ${{ github.event_name == 'pull_request' }}
+      PUBLISH: ${{ github.ref == 'refs/heads/master' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) }}
+      # Github does not allow evaluating a secret in an if condition, so we need to set them as environment variables
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      DOCKERHUB_LOGIN: ${{ secrets.DOCKERHUB_LOGIN }}
     steps:
+      # Image repo names have to be lowercase.
+      - name: Set image repository name
+        run: |
+          if [ "$GITHUB_REPOSITORY" = "Tecnativa/docker-postgres-autoconf" ]; then
+            echo "DOCKER_REPO=tecnativa/postgres-autoconf" >> "$GITHUB_ENV"
+          else
+            echo "DOCKER_REPO=${GITHUB_REPOSITORY,,}" >> "$GITHUB_ENV"
+          fi
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v6
       - run: pip install -r tests/ci-requirements.txt
@@ -67,18 +82,26 @@ jobs:
       - name: Tag Docker Image for PR
         if: env.IS_PR
         run: docker tag ${{ env.DOCKER_REPO }}:${{ matrix.pg_version }}-alpine ${{ env.DOCKER_REPO }}:${{ env.DOCKER_TAG }}
+      - name: Set up QEMU
+        if: env.PUBLISH
+        uses: docker/setup-qemu-action@v4
+      - name: Set up Docker Buildx
+        if: env.PUBLISH
+        uses: docker/setup-buildx-action@v4
       # 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))
+        if: env.PUBLISH && env.DOCKERHUB_TOKEN && env.DOCKERHUB_LOGIN
         env:
           REGISTRY_HOST: docker.io
-          REGISTRY_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-          REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_LOGIN }}
+          REGISTRY_TOKEN: ${{ env.DOCKERHUB_TOKEN }}
+          REGISTRY_USERNAME: ${{ env.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: env.PUBLISH
         env:
           REGISTRY_HOST: ghcr.io
-          REGISTRY_TOKEN: ${{ secrets.BOT_TOKEN }}
-          REGISTRY_USERNAME: ${{ secrets.BOT_LOGIN }}
+          REGISTRY_TOKEN: ${{ secrets.BOT_TOKEN || secrets.GITHUB_TOKEN }}
+          REGISTRY_USERNAME: ${{ secrets.BOT_LOGIN || github.repository_owner }}
+          DOCKER_PLATFORM: linux/amd64,linux/arm64
         run: ./hooks/push

hooks/build

@@ -4,6 +4,7 @@ from plumbum.cmd import date, docker
 
 # Check environment variables are present
 DOCKER_TAG = local.env["DOCKER_TAG"]
+REPO = local.env["DOCKER_REPO"]
 COMMIT = local.env.get("GIT_SHA1")
 DATE = date("--rfc-3339", "ns")
 
@@ -19,7 +20,7 @@ DATE = date("--rfc-3339", "ns")
         "--build-arg",
         "BASE_TAG={}".format(DOCKER_TAG),
         "--tag",
-        "tecnativa/postgres-autoconf:{}".format(DOCKER_TAG),
+        "{}:{}".format(REPO, DOCKER_TAG),
         ".",
     ]
     & FG

hooks/push

@@ -1,12 +1,16 @@
 #!/usr/bin/env python3
 from plumbum import FG, local
-from plumbum.cmd import docker
+from plumbum.cmd import date, docker
 
 REGISTRY = local.env.get("REGISTRY_HOST", "docker.io")
 REPO = local.env["DOCKER_REPO"]
 SUFFIX = local.env.get("DOCKER_REPO_SUFFIX", "")
 VERSION = local.env["DOCKER_TAG"]
 
+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 +24,39 @@ 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
-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
+
+def public_image(tag):
+    return "%s/%s%s:%s" % (REGISTRY, REPO, SUFFIX, tag)
+
+
+def tags_to_push():
+    tags = [VERSION]
+    if VERSION == local.env.get("LATEST_RELEASE"):
+        latest_version = "alpine" if VERSION.endswith("-alpine") else "latest"
+        tags.append(latest_version)
+    return tags
+
+
+if PLATFORMS:
+    BUILD_DATE = date("--rfc-3339", "ns")
+    cmd = docker[
+        "buildx",
+        "build",
+        "--platform",
+        PLATFORMS,
+        "--build-arg",
+        "BASE_TAG={}-alpine".format(PG_VERSION),
+        "--build-arg",
+        "VCS_REF={}".format(GIT_SHA1),
+        "--build-arg",
+        "BUILD_DATE={}".format(BUILD_DATE),
+    ]
+    for tag in tags_to_push():
+        cmd = cmd["--tag", public_image(tag)]
+    (cmd["--push", "."] & FG)
+else:
+    local_image = "%s:%s" % (REPO, VERSION)
+    for tag in tags_to_push():
+        image = public_image(tag)
+        docker["image", "tag", local_image, image] & FG
+        docker["image", "push", image] & FG

tests/test.py

@@ -24,10 +24,12 @@ class PostgresAutoconfCase(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        with local.cwd(local.cwd / ".."):
+        base_tag = local.env.get("BASE_TAG", local.env["DOCKER_TAG"])
+        with local.cwd(local.cwd / ".."), local.env(BASE_TAG=base_tag):
             print("Building image")
             local["./hooks/build"] & FG
-        cls.image = f"tecnativa/postgres-autoconf:{local.env['DOCKER_TAG']}"
+        repo = local.env.get("DOCKER_REPO", "tecnativa/postgres-autoconf")
+        cls.image = f"{repo}:{local.env['DOCKER_TAG']}"
         cls.cert_files = ("client.ca.cert.pem", "server.cert.pem", "server.key.pem")
         return super().setUpClass()