Switch to Fedora 39 and buildx

.dockerignore

@@ -0,0 +1 @@
+*

.github/workflows/main.yml

@@ -5,39 +5,35 @@ on:
       - master
   pull_request:
   schedule:
-    - cron: "0 2 * * 0"
-
-env:
-  DOCKER_BUILDKIT: 1
-  DOCKER_IMAGE: "acornsaustralia/python"
+    - cron: 0 2 * * 0
+  workflow_dispatch:
 
 jobs:
   main:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - uses: hadolint/[email protected]
+      - uses: hadolint/[email protected]
+        if: github.event_name == 'pull_request'
         with:
           dockerfile: Dockerfile
           config: hadolint-ci.yaml
 
-      - name: Build image
-        run: docker-compose -f docker-compose.yml build
-
-      - name: Tag images
-        if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
-        run: |
-          docker tag python:latest ${DOCKER_IMAGE}:latest
-          docker tag python:latest ${DOCKER_IMAGE}:${{ github.run_number }}
+      - name: Build images
+        run: docker buildx bake
 
       - name: Log into registry
         if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login https://index.docker.io/v1/ -u ${{ secrets.DOCKER_USER }} --password-stdin
 
       - name: Push images
         if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
-        run: |
-          docker push ${DOCKER_IMAGE}:latest
-          docker push ${DOCKER_IMAGE}:${{ github.run_number }}
+        run: docker buildx bake --push

Dockerfile

@@ -1,6 +1,12 @@
-FROM registry.fedoraproject.org/fedora-minimal:36
+ARG FEDORA_VERSION
+FROM registry.fedoraproject.org/fedora-minimal:${FEDORA_VERSION}
 
 RUN microdnf --nodocs -y upgrade && \
-    microdnf --nodocs -y install python3-pip && \
+    microdnf --nodocs -y install \
+    gcc \
+    postgresql-devel \
+    python3-devel \
+    python3-pip && \
     microdnf --nodocs -y reinstall tzdata && \
-    microdnf clean all
+    microdnf clean all && \
+    rm -rf /var/cache/*

docker-bake.hcl

@@ -0,0 +1,23 @@
+variable "GITHUB_RUN_NUMBER" {
+  default = null
+}
+
+group "default" {
+  targets = [
+    "python"
+  ]
+}
+
+target "python" {
+  pull = true
+  tags = [
+    "acornsaustralia/python:latest",
+    GITHUB_RUN_NUMBER != null ? "acornsaustralia/python:${GITHUB_RUN_NUMBER}" : ""
+  ]
+  platforms = [
+    "linux/amd64"
+  ]
+  args = {
+    "FEDORA_VERSION" = "39"
+  }
+}