From f27929c48ba87f43c74b542945959b03caf2b0db Mon Sep 17 00:00:00 2001
From: Mayank Chhabra <mayankchhabra9@gmail.com>
Date: Fri, 18 Sep 2020 12:41:49 +0530
Subject: [PATCH] Use official buildx action (#48)

---
 .github/workflows/on-push.yml | 11 +++++++----
 .github/workflows/on-tag.yml  | 21 +++++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index 84d6256..c6d1a7a 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -18,12 +18,15 @@ jobs:
                           run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
                         - name: Checkout project
                           uses: actions/checkout@v2
+                        
+                        - name: Set up QEMU
+                          uses: docker/setup-qemu-action@v1
+                          id: qemu
+
                         - name: Setup Docker buildx action
-                          uses: crazy-max/ghaction-docker-buildx@v1
+                          uses: docker/setup-buildx-action@v1
                           id: buildx
-                          with:
-                                  buildx-version: latest
-                                  qemu-version: latest
+
                         - name: Cache Docker layers
                           uses: actions/cache@v2
                           id: cache
diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml
index 86fec10..68bbac5 100644
--- a/.github/workflows/on-tag.yml
+++ b/.github/workflows/on-tag.yml
@@ -15,22 +15,29 @@ jobs:
                 name: Build and push manager image
                 steps:
                         - name: Set env variables
-                          run: echo ::set-env name=TAG::${GITHUB_REF/refs\/tags\//}   
+                          run: echo ::set-env name=TAG::${GITHUB_REF/refs\/tags\//}
+
                         - name: Show set environment variables
                           run: |
-                                  printf "    TAG: %s\n"  "$TAG"                                  
+                                  printf "    TAG: %s\n"  "$TAG"
+                             
                         - name: Login to Docker for building
                           run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+
                         - name: Checkout project
                           uses: actions/checkout@v2
+
+                        - name: Set up QEMU
+                          uses: docker/setup-qemu-action@v1
+                          id: qemu
+
                         - name: Setup Docker buildx action
-                          uses: crazy-max/ghaction-docker-buildx@v1
+                          uses: docker/setup-buildx-action@v1
                           id: buildx
-                          with:
-                                  buildx-version: latest
-                                  qemu-version: latest
+
                         - name: Available platforms
                           run: echo ${{ steps.buildx.outputs.platforms }}
+
                         - name: Cache Docker layers
                           uses: actions/cache@v2
                           id: cache
@@ -39,6 +46,7 @@ jobs:
                             key: ${{ runner.os }}-buildx-${{ github.sha }}
                             restore-keys: |
                               ${{ runner.os }}-buildx-
+
                         - name: Run Docker buildx against tag
                           run: |
                                   docker buildx build \
@@ -47,6 +55,7 @@ jobs:
                                   --platform linux/amd64,linux/arm64,linux/arm/v7 \
                                   --tag ${{ secrets.DOCKER_HUB_USER }}/manager:$TAG \
                                   --output "type=registry" ./
+
                         - name: Run Docker buildx against latest
                           run: |
                                   docker buildx build \