From 7f62b169ace30e1983e3d1f73c3e2c6cb87e21e5 Mon Sep 17 00:00:00 2001
From: Florian Forster <florian@caos.ch>
Date: Tue, 26 Oct 2021 10:31:24 +0200
Subject: [PATCH] chore(actions): enable buildkit GHA cache again (#2482)

* chore(actions): enable buildkit GHA cache again

* Update .github/workflows/zitadel.yml
---
 .github/workflows/zitadel.yml | 38 +++--------------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/zitadel.yml b/.github/workflows/zitadel.yml
index ff1d687d8b..ba9b1ddb31 100644
--- a/.github/workflows/zitadel.yml
+++ b/.github/workflows/zitadel.yml
@@ -66,16 +66,12 @@ jobs:
         uses: actions/checkout@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-        with:
-          ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged
-          version: v0.6.0
-          buildkitd-flags: --debug
       - uses: docker/build-push-action@v2
         with:
           context: .
           file: ./build/zitadel/Dockerfile
           platforms: linux/amd64
-#          cache-from: type=gha,scope=${{ github.workflow }} (https://github.com/caos/zitadel/issues/2102)
+          cache-from: type=gha,scope=${{ github.workflow }}
           cache-to: type=gha,scope=${{ github.workflow }},mode=max
           outputs: type=local,dest=/tmp/zitadel
           build-args: |
@@ -94,10 +90,6 @@ jobs:
         uses: actions/checkout@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-        with:
-          ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged
-          version: v0.6.0
-          buildkitd-flags: --debug
       - uses: docker/build-push-action@v2
         with:
           context: .
@@ -120,16 +112,12 @@ jobs:
         uses: actions/checkout@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-        with:
-          ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged
-          version: v0.6.0
-          buildkitd-flags: --debug
       - uses: docker/build-push-action@v2
         with:
           context: .
           file: ./build/console/Dockerfile
           platforms: linux/amd64
-#          cache-from: type=gha,scope=${{ github.workflow }} (https://github.com/caos/zitadel/issues/2102)
+          cache-from: type=gha,scope=${{ github.workflow }}
           cache-to: type=gha,scope=${{ github.workflow }},mode=max
           outputs: type=local,dest=/tmp/zitadel-console
       - uses: actions/upload-artifact@v2
@@ -155,10 +143,6 @@ jobs:
           path: .download/zitadel/console
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-        with:
-          ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged
-          version: v0.6.0
-          buildkitd-flags: --debug
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -190,16 +174,12 @@ jobs:
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-        with:
-          ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged
-          version: v0.6.0
-          buildkitd-flags: --debug
       - uses: docker/build-push-action@v2
         with:
           context: .
           file: ./build/operator/Dockerfile
           platforms: linux/amd64
-#          cache-from: type=gha,scope=${{ matrix.goos }}-${{ matrix.goarch }} (https://github.com/caos/zitadel/issues/2102)
+          cache-from: type=gha,scope=${{ matrix.goos }}-${{ matrix.goarch }}
           cache-to: type=gha,scope=${{ matrix.goos }}-${{ matrix.goarch }},mode=max
           outputs: type=local,dest=/tmp/operator
           build-args: |
@@ -231,10 +211,6 @@ jobs:
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-        with:
-          ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged
-          version: v0.6.0
-          buildkitd-flags: --debug
       - uses: docker/build-push-action@v2
         with:
           context: .
@@ -264,10 +240,6 @@ jobs:
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-        with:
-          ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged
-          version: v0.6.0
-          buildkitd-flags: --debug
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -299,10 +271,6 @@ jobs:
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-        with:
-          ## Workaround until https://github.com/docker/build-push-action/issues/252#issuecomment-804898823 is merged
-          version: v0.6.0
-          buildkitd-flags: --debug
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with: