Revert "Merge dashpay#6588: ci: attempt to fix docker builds by build…

…ing arm64 and amd64 separately"

This reverts commit db0df3c, reversing
changes made to b6ea178.

.github/workflows/release_docker_hub.yml

@@ -5,13 +5,18 @@ on:
     types: [published]
 
 jobs:
-  release-amd64:
-    name: Release to Docker Hub (amd64)
+  release:
+    name: Release to Docker Hub
     runs-on: ubuntu-22.04
     steps:
     - name: Checkout
       uses: actions/checkout@v3
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+      with:
+        image: tonistiigi/binfmt:qemu-v7.0.0-28
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
@@ -55,45 +60,8 @@ jobs:
         flavor: |
           suffix=${{ steps.suffix.outputs.result }},onlatest=true
 
-    - name: Build and push (amd64)
-      id: docker_build_amd64
-      uses: docker/build-push-action@v3
-      with:
-        context: ./contrib/containers/deploy
-        file: ./contrib/containers/deploy/Dockerfile.GitHubActions.Release
-        push: true
-        provenance: mode=max
-        sbom: true
-        tags: ${{ steps.docker_meta.outputs.tags }}
-        labels: ${{ steps.docker_meta.outputs.labels }}
-        build-args: |
-          TAG=${{ steps.get_tag.outputs.build_tag }}
-          GITHUB_REPOSITORY=${{ github.repository }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
-        platforms: linux/amd64
-
-    - name: Image digest
-      run: echo ${{ steps.docker_build_amd64.outputs.digest }}
-
-  release-arm64:
-    name: Release to Docker Hub (arm64)
-    runs-on: ubuntu-22.04-arm
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-    - name: Build and push (arm64)
-      id: docker_build_arm64
+    - name: Build and push
+      id: docker_build
       uses: docker/build-push-action@v3
       with:
         context: ./contrib/containers/deploy
@@ -108,7 +76,7 @@ jobs:
           GITHUB_REPOSITORY=${{ github.repository }}
         cache-from: type=gha
         cache-to: type=gha,mode=max
-        platforms: linux/arm64
+        platforms: linux/amd64,linux/arm64
 
     - name: Image digest
-      run: echo ${{ steps.docker_build_arm64.outputs.digest }}
+      run: echo ${{ steps.docker_build.outputs.digest }}