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

… building arm64 and amd64 separately"

e227897 Revert "Merge #6588: ci: attempt to fix docker builds by building arm64 and amd64 separately" (pasta)

Pull request description:

  ## What was done?
  This reverts commit db0df3c, reversing changes made to b6ea178.

  ## How Has This Been Tested?
  The changes in develop before this commit were sufficient for fixing the release

  diff is empty between: https://github.com/dashpay/dash/compare/b6ea17831e4a5f2c9378eb048a801a48eaed574d..e2278979dfec80d662f36ccc737fe2c7d4261ff9

  ## Breaking Changes
  None

  ## Checklist:
    _Go over all the following points, and put an `x` in all the boxes that apply._
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

Top commit has no ACKs.

Tree-SHA512: 26bb2cd55a0267b56f86938d97ddfa32f0cdd8a2786c0366eedbcddf706e38b6af93cd29ab98ba420cbdbd112561ded61e2dba906c4b233ad737f24730f58ddc

.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 }}