From 547a897e03422c42d11c13925be1396b24f1076e Mon Sep 17 00:00:00 2001
From: simeononsecurity <4913771+simeononsecurity@users.noreply.github.com>
Date: Tue, 16 Jan 2024 09:04:29 -0600
Subject: [PATCH] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 4e5a27c..5772480 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -32,9 +32,6 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-    - 
-      name: Build the Docker image
-      run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && docker buildx build --platform linux/amd64,linux/armhf,linux/arm64 -t simeononsecurity/helium_diy_middleman:latest --progress=plain --push .
     -
         name: Build and push
         uses: docker/build-push-action@v2
@@ -50,6 +47,19 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.PAT_TOKEN }}
 
-    - name: Build the simeononsecurity/helium_diy_middleman:latest Docker image for Github Registry
-      run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/simeononsecurity/helium_diy_middleman:latest --progress=plain --push .
-
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        push: true
+        platforms: linux/amd64,linux/armhf,linux/arm64
+        file: Dockerfile
+        cache-from: |
+          type=gha .
+          type=inline .
+          simeononsecurity/${{ secrets.DOCKER_USERNAME }}/simeononsecurity/helium_diy_middleman:latest
+          type=registry,ref=simeononsecurity/${{ secrets.DOCKER_USERNAME }}/simeononsecurity/helium_diy_middleman:latest
+        cache-to: |
+          type=registry,ref=simeononsecurity/${{ secrets.DOCKER_USERNAME }}/simeononsecurity/helium_diy_middleman:latest
+        tags: simeononsecurity/${{ secrets.DOCKER_USERNAME }}/simeononsecurity/helium_diy_middleman:latest, ghcr.io/simeononsecurity/${{ secrets.DOCKER_USERNAME }}/simeononsecurity/helium_diy_middleman:latest
+        github-token: ${{ secrets.PAT_TOKEN }}