From ed5252e62eb848ff11fd8b9851585a849a01d7cc Mon Sep 17 00:00:00 2001
From: "Patrik J. Braun" <bpatrik@users.noreply.github.com>
Date: Fri, 25 Dec 2020 15:31:59 +0100
Subject: [PATCH] Update build.yml

Updating alpine build actions
---
 .github/workflows/build.yml | 64 ++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ead372f9..181b6f01 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -92,48 +92,46 @@ jobs:
       -
         uses: actions/download-artifact@v2
         with:
-          name: pigallery2-release
+          name: pigallery2-release        
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
       -
         name: Set up Docker Buildx
-        id: buildx
         uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
         with:
-          buildx-version: latest
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}          
       -
-        name: Available platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
-      -
-        name: Docker login
-        run: |
-          docker login -u "${DOCKER_REGISTRY_USERNAME}" -p "${DOCKER_REGISTRY_PASSWORD}"
-        env:
-          DOCKER_REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
-          DOCKER_REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
-      -
-        name: Run Buildx alpine
+        name: Build and push alpine nightly
         if: startsWith(steps.vars.outputs.type , 'head')
-        run: |
-          docker buildx build \
-            --platform linux/amd64,linux/arm64,linux/arm/v7 \
-            --output "type=image,push=true" \
-            --tag bpatrik/pigallery2:nightly-alpine \
-            --file docker/alpine/Dockerfile.build  .
-      - name: Run Buildx alpine for tag
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: docker/alpine/Dockerfile.build
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          type: image
+          tags: bpatrik/pigallery2:nightly-alpine       
+      -
+        name: Build and push alpine nightly
         if: startsWith(steps.vars.outputs.type , 'tag')
         env:
           RELEASE_VERSION: ${{ steps.vars.outputs.tag }}
-        run: |
-          docker buildx build \
-            --platform linux/amd64,linux/arm64,linux/arm/v7 \
-            --output "type=image,push=true" \
-            --tag bpatrik/pigallery2:nightly-alpine \
-            --tag bpatrik/pigallery2:$RELEASE_VERSION-alpine \
-            --tag bpatrik/pigallery2:latest-alpine \
-            --file docker/alpine/Dockerfile.build  .
-      -
-        name: Docker logout
-        run: |
-          docker logout
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: docker/alpine/Dockerfile.build
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          type: image
+          tags: |
+            bpatrik/pigallery2:nightly-alpine
+            bpatrik/pigallery2:$RELEASE_VERSION-alpine
+            bpatrik/pigallery2:latest-alpine
   build-stretch:
     runs-on: [ubuntu-latest]
     needs: [create-release]