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