fix(ci): Move docker push fix to the setup action (#5998)

* Move docker push fix to the setup action * Apply docker push fix to the lightwalletd docker build
ZcashFoundation · Jan 19, 2023 · ddda4d0 · ddda4d0
1 parent 2018d49
commit ddda4d0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
@@ -91,6 +91,12 @@ jobs:
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2
+        with:
+          # TODO: change after new buildkit version gets fixed
+          # https://github.com/moby/buildkit/issues/3347
+          # https://github.com/docker/build-push-action/issues/761#issuecomment-1383822381
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
 
       - name: Authenticate to Google Cloud
         id: auth
@@ -155,8 +161,3 @@ jobs:
             type=registry,ref=us-docker.pkg.dev/zealous-zebra/zebra/${{ inputs.image_name }}:${{ env.GITHUB_REF_SLUG_URL }}-cache
             type=registry,ref=us-docker.pkg.dev/zealous-zebra/zebra/${{ inputs.image_name }}:main-cache
           cache-to: type=registry,ref=us-docker.pkg.dev/zealous-zebra/zebra/${{ inputs.image_name }}:${{ env.GITHUB_REF_SLUG_URL }}-cache,mode=max
-          # TODO: change after new buildkit version gets fixed
-          # https://github.com/moby/buildkit/issues/3347
-          # https://github.com/docker/build-push-action/issues/761
-          driver-opts: |
-            image=moby/buildkit:v0.10.6
diff --git a/.github/workflows/zcash-lightwalletd.yml b/.github/workflows/zcash-lightwalletd.yml
@@ -102,6 +102,12 @@ jobs:
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2
+        with:
+          # TODO: change after new buildkit version gets fixed
+          # https://github.com/moby/buildkit/issues/3347
+          # https://github.com/docker/build-push-action/issues/761#issuecomment-1383822381
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
 
       # Setup gcloud CLI
       - name: Authenticate to Google Cloud