duplicate build & upload tasks as docker type in buildx outputs is incompatible with multi-platform images

Author: shtouff

.github/workflows/reusable-precommit.yml

@@ -206,7 +206,7 @@ jobs:
           cp log4j2.yaml assets
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Build
+      - name: Build for amd64
         uses: docker/build-push-action@v3
         with:
           push: false
@@ -216,13 +216,32 @@ jobs:
           labels: |
             org.batfish.batfish-tag=${{ needs.bf_version.outputs.bf_sha }}
             org.batfish.batfish-version=${{ needs.bf_version.outputs.bf_version }}
-          outputs: type=docker,dest=/tmp/bf.tar
+          platforms: linux/amd64
+          outputs: type=docker,dest=/tmp/bf-amd64.tar
           context: .
-      - name: Upload docker image
+      - name: Upload linux/amd64 docker image
         uses: actions/upload-artifact@v3
         with:
           name: bf_image
-          path: /tmp/bf.tar
+          path: /tmp/bf-amd64.tar
+      - name: Build for arm64
+        uses: docker/build-push-action@v3
+        with:
+          push: false
+          file: batfish.dockerfile
+          build-args: ASSETS=./assets
+          tags: batfish/batfish:test-${{ needs.bf_version.outputs.bf_version }}
+          labels: |
+            org.batfish.batfish-tag=${{ needs.bf_version.outputs.bf_sha }}
+            org.batfish.batfish-version=${{ needs.bf_version.outputs.bf_version }}
+          platforms: linux/arm64
+          outputs: type=docker,dest=/tmp/bf-arm64.tar
+          context: .
+      - name: Upload linux/arm64 docker image
+        uses: actions/upload-artifact@v3
+        with:
+          name: bf_image
+          path: /tmp/bf-arm64.tar
   allinone_image_build:
     runs-on: ubuntu-latest
     needs:
@@ -266,7 +285,27 @@ jobs:
           cp wrapper.sh assets
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Build
+      - name: Build for linux/amd64
+        uses: docker/build-push-action@v3
+        with:
+          push: false
+          file: allinone.dockerfile
+          build-args: ASSETS=./assets
+          tags: batfish/allinone:test-${{ needs.bf_version.outputs.bf_version }}
+          labels: |
+            org.batfish.allinone-tag=${{ needs.bf_version.outputs.bf_sha }}_${{ needs.bf_version.outputs.pybf_sha }}
+            org.batfish.batfish-tag=${{ needs.bf_version.outputs.bf_sha }}
+            org.batfish.pybatfish-tag=${{ needs.bf_version.outputs.pybf_sha }}
+            org.batfish.batfish-version=${{ needs.bf_version.outputs.bf_version }}
+          platforms: linux/amd64
+          outputs: type=docker,dest=/tmp/allinone-amd64.tar
+          context: .
+      - name: Upload linux/amd64 docker image
+        uses: actions/upload-artifact@v3
+        with:
+          name: allinone_image
+          path: /tmp/allinone-amd64.tar
+      - name: Build for linux/arm64
         uses: docker/build-push-action@v3
         with:
           push: false
@@ -278,10 +317,11 @@ jobs:
             org.batfish.batfish-tag=${{ needs.bf_version.outputs.bf_sha }}
             org.batfish.pybatfish-tag=${{ needs.bf_version.outputs.pybf_sha }}
             org.batfish.batfish-version=${{ needs.bf_version.outputs.bf_version }}
-          outputs: type=docker,dest=/tmp/allinone.tar
+          platforms: linux/arm64
+          outputs: type=docker,dest=/tmp/allinone-arm64.tar
           context: .
-      - name: Upload docker image
+      - name: Upload linux/arm64 docker image
         uses: actions/upload-artifact@v3
         with:
           name: allinone_image
-          path: /tmp/allinone.tar
+          path: /tmp/allinone-arm64.tar