Try using Arm runners

Author: dc-mak

.github/workflows/docker.yml

@@ -21,15 +21,22 @@ concurrency:
   group: docker-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: false
 
-# Instructions from https://depot.dev/blog/multi-platform-docker-images-in-github-actions
 jobs:
-  docker-release-ubuntu:
-    runs-on: ubuntu-latest
+  build-and-release:
+
+    strategy:
+      matrix:
+        os: [ubuntu, redhat]
+        runner: [latest, 24.04-arm]
+
+    runs-on: ubuntu-${{ matrix.runner }}
+
     permissions:
       packages: write
       contents: read
       attestations: write
       id-token: write
+
     steps:
     - uses: actions/checkout@v4
 
@@ -40,28 +47,24 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3.4.0
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Build multi-platform image
+    - name: Build ${{ matrix.os }}-${{ matrix.runner }} image
       uses: docker/build-push-action@v5
       with:
         context: .
-        platforms: linux/amd64,linux/arm64
         push: ${{ github.event_name != 'pull_request' }}
-        tags: ${{env.CN_IMAGE_ID}}:release
-        file: Dockerfile.ubuntu
+        tags: ${{ env.CN_IMAGE_ID }}:release-${{ matrix.os }}-${{ matrix.runner }}
+        file: Dockerfile.${{ matrix.os }}
+        attests: type=sbom
+        provenance: mode=max
         github-token: ${{ secrets.GITHUB_TOKEN }}
 
-  docker-release-redhat:
+  combine-multiplatform:
+    strategy:
+      matrix:
+        os: [ubuntu, redhat]
+
     runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
+    needs: [build-and-release]
     steps:
     - uses: actions/checkout@v4
 
@@ -72,35 +75,28 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3.4.0
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Build multi-platform image
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        platforms: linux/amd64,linux/arm64
-        push: ${{ github.event_name != 'pull_request' }}
-        tags: ${{env.CN_IMAGE_ID}}:release-redhat
-        file: Dockerfile.redhat
-        attests: type=sbom
-        provenance: mode=max
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Create ${{ matrix.os }} manifest and push
+      run: |
+        docker manifest create \
+          ${{ env.CN_IMAGE_ID }}:release-${{ matrix.os }} \
+          --amend ${{ env.CN_IMAGE_ID }}:release-${{ matrix.os }}-latest \
+          --amend ${{ env.CN_IMAGE_ID }}:release-${{ matrix.os }}-24.04-arm \
 
 # Other CI is testing anyway - if need be, can run tests in Dockerfile itself
   test-docker-images:
-    runs-on: ubuntu-latest
+
     if: ${{ github.event_name != 'pull_request' }}
-    needs: [docker-release-redhat, docker-release-ubuntu]
+
     strategy:
       matrix:
-        tag: [release, release-redhat]
+        os: [ubuntu, redhat]
+    runs-on: ubuntu-latest
+    needs: [build-and-release]
+
     steps:
     - uses: actions/checkout@v4
 
-    - name: Run CN CI tests
+    - name: Run CI tests
       run: |
-        docker pull ${{env.CN_IMAGE_ID}}:${{ matrix.tag }}
-        docker run -v $PWD:/work -w /work ${{env.CN_IMAGE_ID}}:${{ matrix.tag }} bash tests/run-cn.sh
+        docker pull ${{env.CN_IMAGE_ID}}:release-${{ matrix.os }}
+        docker run -v $PWD:/work -w /work ${{env.CN_IMAGE_ID}}:release-${{ matrix.os }} bash tests/run-cn.sh