From 7c27136ec8f3fb670f0aa9d991e12b05cf781823 Mon Sep 17 00:00:00 2001
From: Lukas Prettenthaler <rdx@wsn.at>
Date: Thu, 19 Aug 2021 11:24:52 +0200
Subject: [PATCH] fix build

---
 .github/workflows/multiarch.yml | 3 +--
 Dockerfile                      | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml
index bbfd512..38b0bc1 100644
--- a/.github/workflows/multiarch.yml
+++ b/.github/workflows/multiarch.yml
@@ -41,8 +41,7 @@ jobs:
           tags: ${{ matrix.arch }}
           arch: ${{ matrix.arch }}
           build-args: |
-            ALPINE_ARCH=${{ matrix.arch }}
-            ALPINE_VERSION=${{ env.ALPINE_VERSION }}
+            FROM_IMAGE=${{ format('docker.io/{0}/alpine:{1}', matrix.arch, env.ALPINE_VERSION) }}
             ZT_COMMIT=${{ env.ZT_COMMIT }}
             ZT_VERSION=${{ env.ZT_VERSION }}
           dockerfiles: |
diff --git a/Dockerfile b/Dockerfile
index 3026007..3327821 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,8 @@
-ARG ALPINE_ARCH
-ARG ALPINE_VERSION
+ARG FROM_IMAGE
 ARG ZT_COMMIT
 ARG ZT_VERSION
 
-FROM docker.io/\${ALPINE_ARCH}/alpine:${ALPINE_VERSION} as builder
+FROM ${FROM_IMAGE} as builder
 
 RUN apk add --update alpine-sdk linux-headers \
   && git clone --quiet https://github.com/zerotier/ZeroTierOne.git /src \
@@ -11,7 +10,7 @@ RUN apk add --update alpine-sdk linux-headers \
   && cd /src \
   && make -f make-linux.mk
 
-FROM docker.io/\${ALPINE_ARCH}/alpine:${ALPINE_VERSION}
+FROM ${FROM_IMAGE}
 LABEL version="${ZT_VERSION}"
 LABEL description="ZeroTier One as Docker Image"