From 9d48cf68de9e0d04836567fb4bc468c7f1895c72 Mon Sep 17 00:00:00 2001
From: Daniel Lando <daniel.sorridi@gmail.com>
Date: Fri, 12 Jun 2020 08:07:39 +0200
Subject: [PATCH] chore: fix docker build and cross build even on pr (#576)

---
 .github/workflows/dockerbuild.yml | 10 ++++++----
 docker/Dockerfile                 |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
index 33746220..e1956a88 100644
--- a/.github/workflows/dockerbuild.yml
+++ b/.github/workflows/dockerbuild.yml
@@ -14,11 +14,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: crazy-max/ghaction-docker-buildx@v1
 
       - name: Just build on PR
         if: ${{ github.event_name == 'pull_request' }}
         run: |
-          docker build -f docker/Dockerfile .
+          docker buildx build \
+          -f docker/Dockerfile \
+          --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386 \
+          -t robertslando/zwave2mqtt:dev \
+          .
 
       - name: Login to dockerhub
         if: ${{ github.event_name != 'pull_request' }}
@@ -28,9 +33,6 @@ jobs:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
-      - uses: crazy-max/ghaction-docker-buildx@v1
-        if: ${{ github.event_name != 'pull_request' }}
-
       - name: Dev
         if: ${{ github.ref == 'refs/heads/master'}}
         run: |
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7c208dd9..5db3582c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@ FROM chrisns/openzwave:alpine as ozw
 
 # ----------------
 # STEP 2:
-FROM node:12.18.0-alpine AS build-z2m
+FROM node:erbium-alpine AS build-z2m
 
 # Install required dependencies
 RUN apk --no-cache add \
@@ -38,7 +38,7 @@ RUN rm -rf \
 
 # ----------------
 # STEP 3:
-FROM node:12.18.0-alpine
+FROM node:erbium-alpine
 
 LABEL maintainer="robertsLando"