Merge branch 'arm64-runner'

Author: rongxin-liu

.github/workflows/main.yml

@@ -2,34 +2,34 @@ on:
     - push
     - workflow_dispatch
 jobs:
-  build:
+  build-amd64:
     runs-on: ubuntu-latest-64-cores
     steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log into Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - name: Build for linux/amd64
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           build-args: |
             VCS_REF=${{ github.sha }}
+            BUILDARCH=amd64
           load: true
           platforms: linux/amd64
-          tags: cs50/server:amd64
+          tags: |
+            cs50/server:amd64
+            cs50/server:canary-amd64
           cache-from: type=registry,ref=cs50/server:amd64-buildcache
           cache-to: type=registry,ref=cs50/server:amd64-buildcache,mode=max
 
@@ -43,31 +43,93 @@ jobs:
         run: |
           docker push cs50/server:amd64
 
+      - name: Push linux/amd64 build to Docker Hub (canary)
+        run: |
+          docker push cs50/server:canary-amd64
+
+  build-arm64:
+    runs-on: ubuntu-latest-64-cores-arm
+    steps:
+      - name: Install Docker (remove once Docker is pre-installed on arm64 runners)
+        run: |
+          export DEBIAN_FRONTEND=noninteractive
+          sudo apt update
+          sudo apt install -y ca-certificates curl
+          sudo install -m 0755 -d /etc/apt/keyrings
+          sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+          sudo chmod a+r /etc/apt/keyrings/docker.asc
+          echo \
+          "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+          $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+          sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+          sudo apt update
+          sudo apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+          sudo usermod -aG docker $USER
+          sudo apt install -y acl
+          sudo setfacl --modify user:$USER:rw /var/run/docker.sock
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log into Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Install Python (replace with setup-python once available on arm64 runners)
+        run: |
+          sudo apt install -y python3 python3-pip
+
       - name: Build for linux/arm64
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           build-args: |
             VCS_REF=${{ github.sha }}
+            BUILDARCH=arm64
           load: true
           platforms: linux/arm64
-          tags: cs50/server:arm64
+          tags: |
+            cs50/server:arm64
+            cs50/server:canary-arm64
           cache-from: type=registry,ref=cs50/server:arm64-buildcache
           cache-to: type=registry,ref=cs50/server:arm64-buildcache,mode=max
 
       - name: Squash for linux/arm64
         run: |
           pip3 install docker-squash
-          docker-squash --tag cs50/server:arm64 cs50/server:arm64
+          $HOME/.local/bin/docker-squash --tag cs50/server:arm64 cs50/server:arm64
 
       - name: Push linux/arm64 build to Docker Hub
         if: ${{ github.ref == 'refs/heads/main' }}
         run: |
           docker push cs50/server:arm64
 
+      - name: Push linux/arm64 build to Docker Hub (canary)
+        run: |
+          docker push cs50/server:canary-arm64
+
+  finalize:
+    needs: [build-amd64, build-arm64]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Log into Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Create multi-arch manifest and push to Docker Hub
         if: ${{ github.ref == 'refs/heads/main' }}
         run: |
           docker manifest create cs50/server:latest \
           --amend cs50/server:amd64 \
           --amend cs50/server:arm64
           docker manifest push cs50/server:latest
+
+      - name: Create multi-arch manifest and push to Docker Hub (canary)
+        run: |
+          docker manifest create cs50/server:canary \
+          --amend cs50/server:canary-amd64 \
+          --amend cs50/server:canary-arm64
+          docker manifest push cs50/server:canary