From ddda4d036d4a1d52f9af71c39e57e1aef4027a67 Mon Sep 17 00:00:00 2001 From: teor Date: Thu, 19 Jan 2023 13:30:38 +1000 Subject: [PATCH] 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 --- .github/workflows/build-docker-image.yml | 11 ++++++----- .github/workflows/zcash-lightwalletd.yml | 6 ++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index 3ff52672e6a..7327f50b125 100644 --- 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 index c5dfa30d383..17670adf660 100644 --- 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