ci: build manifest by hand

Signed-off-by: Ramon Roche <[email protected]>

Author: mrpollo

.github/workflows/dev_container.yml

@@ -60,12 +60,14 @@ jobs:
     needs: setup
     strategy:
       matrix:
-        platform:
-          - arm64
-          - x64
-    runs-on: [runs-on,"runner=8cpu-linux-${{ matrix.platform }}","image=ubuntu24-full-${{ matrix.platform }}","run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
-    env:
-      PLATFORM_NAME: ${{ matrix.platform == 'arm64' && 'linux/arm64' || 'linux/amd64' }}
+        include:
+          - platform: linux/arm64
+            arch: arm64
+            runner: arm64
+          - platform: linux/amd64
+            arch: amd64
+            runner: x64
+    runs-on: [runs-on,"runner=8cpu-linux-${{ matrix.runner }}","image=ubuntu24-full-${{ matrix.runner }}","run-id=${{ github.run_id }}",spot=false,extras=s3-cache]
     steps:
       - uses: runs-on/action@v1
       - uses: actions/checkout@v4
@@ -99,9 +101,11 @@ jobs:
         id: docker
         with:
           context: Tools/setup
-          tags: ${{ needs.setup.outputs.meta_tags }}
+          tags: |
+            ghcr.io/px4/px4-dev:${{ matrix.arch }}-${{ needs.setup.outputs.px4_version }}
+            px4io/px4-dev:${{ matrix.arch }}-${{ needs.setup.outputs.px4_version }}
           labels: ${{ needs.setup.outputs.meta_labels }}
-          platforms: ${{ env.PLATFORM_NAME }}
+          platforms: ${{ matrix.platform }}
           load: false
           push: true
           cache-from: type=gha,version=1
@@ -157,24 +161,26 @@ jobs:
 
       - name: Verify Images Exist Before Creating Manifest
         run: |
-          docker manifest inspect px4io/px4-dev:${{ needs.setup.outputs.px4_version }} || echo "⚠️ Warning: No AMD64/ARM64 image found!"
-          docker manifest inspect ghcr.io/PX4/px4-dev:${{ needs.setup.outputs.px4_version }} || echo "⚠️ Warning: No AMD64/ARM64 image found!"
+          docker manifest inspect px4io/px4-dev:arm64-${{ needs.setup.outputs.px4_version }} || echo "⚠️ Warning: No ARM64 image found!"
+          docker manifest inspect px4io/px4-dev:amd64-${{ needs.setup.outputs.px4_version }} || echo "⚠️ Warning: No AMD64 image found!"
+          docker manifest inspect ghcr.io/px4/px4-dev:arm64-${{ needs.setup.outputs.px4_version }} || echo "⚠️ Warning: No ARM64 image found!"
+          docker manifest inspect ghcr.io/px4/px4-dev:amd64-${{ needs.setup.outputs.px4_version }} || echo "⚠️ Warning: No AMD64 image found!"
 
       - name: Create and Push Multi-Arch Manifest for Docker Hub
         run: |
           docker manifest create px4io/px4-dev:${{ needs.setup.outputs.px4_version }} \
-            --amend px4io/px4-dev:${{ needs.setup.outputs.px4_version }}@$(docker manifest inspect --format '{{ (index .Manifests 0).Digest }}' px4io/px4-dev:${{ needs.setup.outputs.px4_version }}) \
-            --amend px4io/px4-dev:${{ needs.setup.outputs.px4_version }}@$(docker manifest inspect --format '{{ (index .Manifests 1).Digest }}' px4io/px4-dev:${{ needs.setup.outputs.px4_version }})
+            --amend px4io/px4-dev:arm64-${{ needs.setup.outputs.px4_version }} \
+            --amend px4io/px4-dev:amd64-${{ needs.setup.outputs.px4_version }}
 
           docker manifest push px4io/px4-dev:${{ needs.setup.outputs.px4_version }}
 
       - name: Create and Push Multi-Arch Manifest for GHCR
         run: |
-          docker manifest create ghcr.io/PX4/px4-dev:${{ needs.setup.outputs.px4_version }} \
-            --amend ghcr.io/PX4/px4-dev:${{ needs.setup.outputs.px4_version }}@$(docker manifest inspect --format '{{ (index .Manifests 0).Digest }}' ghcr.io/PX4/px4-dev:${{ needs.setup.outputs.px4_version }}) \
-            --amend ghcr.io/PX4/px4-dev:${{ needs.setup.outputs.px4_version }}@$(docker manifest inspect --format '{{ (index .Manifests 1).Digest }}' ghcr.io/PX4/px4-dev:${{ needs.setup.outputs.px4_version }})
+          docker manifest create ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }} \
+            --amend ghcr.io/px4/px4-dev:arm64-${{ needs.setup.outputs.px4_version }} \
+            --amend ghcr.io/px4/px4-dev:amd64-${{ needs.setup.outputs.px4_version }}
 
-          docker manifest push ghcr.io/PX4/px4-dev:${{ needs.setup.outputs.px4_version }}
+          docker manifest push ghcr.io/px4/px4-dev:${{ needs.setup.outputs.px4_version }}
 
       # - name: Push Images to Registry
       #   uses: docker/build-push-action@v6