holm/zerotier-docker
1
1
Fork 0
forked from extern/zerotier-docker
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Lukas Prettenthaler 2021-08-19 11:24:52 +02:00
parent d3a67cb5a0
commit 7c27136ec8
No known key found for this signature in database
GPG Key ID: 58E5A82932BCE65D
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/multiarch.yml vendored
View File

@ -41,8 +41,7 @@ jobs:
tags: ${{ matrix.arch }} tags: ${{ matrix.arch }}
arch: ${{ matrix.arch }} arch: ${{ matrix.arch }}
build-args: | build-args: |
ALPINE_ARCH=${{ matrix.arch }} FROM_IMAGE=${{ format('docker.io/{0}/alpine:{1}', matrix.arch, env.ALPINE_VERSION) }}
ALPINE_VERSION=${{ env.ALPINE_VERSION }}
ZT_COMMIT=${{ env.ZT_COMMIT }} ZT_COMMIT=${{ env.ZT_COMMIT }}
ZT_VERSION=${{ env.ZT_VERSION }} ZT_VERSION=${{ env.ZT_VERSION }}
dockerfiles: | dockerfiles: |

7
Dockerfile
View File

@ -1,9 +1,8 @@
ARG ALPINE_ARCH ARG FROM_IMAGE
ARG ALPINE_VERSION
ARG ZT_COMMIT ARG ZT_COMMIT
ARG ZT_VERSION 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 \ RUN apk add --update alpine-sdk linux-headers \
&& git clone --quiet https://github.com/zerotier/ZeroTierOne.git /src \ && git clone --quiet https://github.com/zerotier/ZeroTierOne.git /src \
@ -11,7 +10,7 @@ RUN apk add --update alpine-sdk linux-headers \
&& cd /src \ && cd /src \
&& make -f make-linux.mk && make -f make-linux.mk
FROM docker.io/\${ALPINE_ARCH}/alpine:${ALPINE_VERSION} FROM ${FROM_IMAGE}
LABEL version="${ZT_VERSION}" LABEL version="${ZT_VERSION}"
LABEL description="ZeroTier One as Docker Image" LABEL description="ZeroTier One as Docker Image"