refactor: Improve multi-arch build caching and manifest creation

Author: code-inflation

.github/workflows/CI.yml

@@ -51,7 +51,7 @@ jobs:
           tags: |
             cybuerg/cfspeedtest:${{ github.sha }}-amd64
           cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+          cache-to: type=local,dest=/tmp/.buildx-cache-amd64,mode=max
           outputs: type=docker,dest=/tmp/docker-image-amd64.tar
 
       - name: Build Docker image for arm64
@@ -62,10 +62,13 @@ jobs:
           tags: |
             cybuerg/cfspeedtest:${{ github.sha }}-arm64
           cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+          cache-to: type=local,dest=/tmp/.buildx-cache-arm64,mode=max
           outputs: type=docker,dest=/tmp/docker-image-arm64.tar
-      - name: Move cache
+      - name: Merge and move cache
         run: |
+          mkdir -p /tmp/.buildx-cache-new
+          cp -r /tmp/.buildx-cache-amd64/* /tmp/.buildx-cache-new/ || true
+          cp -r /tmp/.buildx-cache-arm64/* /tmp/.buildx-cache-new/ || true
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
       - name: Upload Docker images as artifacts

.github/workflows/release.yaml

@@ -64,17 +64,43 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push Docker image
+      - name: Build and push Docker image for amd64
         uses: docker/build-push-action@v5
         with:
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: true
           tags: |
-            cybuerg/cfspeedtest:${{ github.ref_name }}
-            cybuerg/cfspeedtest:latest
+            cybuerg/cfspeedtest:${{ github.ref_name }}-amd64
+            cybuerg/cfspeedtest:latest-amd64
           cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-      - name: Move cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-amd64,mode=max
+          
+      - name: Build and push Docker image for arm64
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/arm64
+          push: true
+          tags: |
+            cybuerg/cfspeedtest:${{ github.ref_name }}-arm64
+            cybuerg/cfspeedtest:latest-arm64
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-arm64,mode=max
+          
+      - name: Create and push multi-platform manifest
+        run: |
+          docker manifest create cybuerg/cfspeedtest:${{ github.ref_name }} \
+            cybuerg/cfspeedtest:${{ github.ref_name }}-amd64 \
+            cybuerg/cfspeedtest:${{ github.ref_name }}-arm64
+          docker manifest create cybuerg/cfspeedtest:latest \
+            cybuerg/cfspeedtest:latest-amd64 \
+            cybuerg/cfspeedtest:latest-arm64
+          docker manifest push cybuerg/cfspeedtest:${{ github.ref_name }}
+          docker manifest push cybuerg/cfspeedtest:latest
+          
+      - name: Merge and move cache
         run: |
+          mkdir -p /tmp/.buildx-cache-new
+          cp -r /tmp/.buildx-cache-amd64/* /tmp/.buildx-cache-new/ || true
+          cp -r /tmp/.buildx-cache-arm64/* /tmp/.buildx-cache-new/ || true
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache