From a7e433a0b7912a2f7689258d61bbec26ba83f26d Mon Sep 17 00:00:00 2001
From: andreespirela <andreespirela@outlook.com>
Date: Tue, 3 Sep 2024 16:13:11 -0400
Subject: [PATCH] chore: Test docker/build-push-action@v6

---
 .github/workflows/gcp-docker.yml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/gcp-docker.yml b/.github/workflows/gcp-docker.yml
index 5bfdbb16c09f..d32af6898a9a 100644
--- a/.github/workflows/gcp-docker.yml
+++ b/.github/workflows/gcp-docker.yml
@@ -61,9 +61,13 @@ jobs:
           echo "::set-output name=tag::${tag}"
           echo "Docker tag: ${tag}"
 
-      - name: Build docker img
-        run: |-
-          docker build . -t wevm:local --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }}
+      - name: Build
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          tags: wevm:local,us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.get-tag.outputs.short_ref }},wevm:local us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }}
+          cache-from: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }}
+          cache-to: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }},mode=max
 
       - name: Test Docker
         run: |-
@@ -77,9 +81,10 @@ jobs:
           docker compose down
           cd .. && sudo rm -rf .testnet
 
-      - name: Build and Push Container
-        run: |-
-          docker tag wevm:local us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.get-tag.outputs.short_ref }}
-          docker tag wevm:local us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }}
-          docker push "us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.get-tag.outputs.short_ref }}"
-          docker push "us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }}"
\ No newline at end of file
+      - name: Build
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: wevm:local,us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.get-tag.outputs.short_ref }},wevm:local us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }}
+          cache-from: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }}
+          cache-to: type=registry,ref=us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/wevm:${{ steps.tag.outputs.tag }},mode=max