diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-11-28 08:43:50 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-11-28 08:43:50 -0800 |
| commit | 5da7d6d1ae09c6d8b714fd3881e9676fb17fa6b5 (patch) | |
| tree | 3a662ac3926117df3d8e6c452ade011db442d1ce /ext | |
| parent | 01d5d7d78bceb3dbbf91b265413a22c40cbe45f5 (diff) | |
| parent | 65e0a747183214396eb2b8cf5a2cb4dec64b1987 (diff) | |
| download | infinitytier-5da7d6d1ae09c6d8b714fd3881e9676fb17fa6b5.tar.gz infinitytier-5da7d6d1ae09c6d8b714fd3881e9676fb17fa6b5.zip | |
Merge docker update PR
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/installfiles/linux/zerotier-containerized/Dockerfile | 36 | ||||
| -rwxr-xr-x | ext/installfiles/linux/zerotier-containerized/main.sh | 2 |
2 files changed, 21 insertions, 17 deletions
diff --git a/ext/installfiles/linux/zerotier-containerized/Dockerfile b/ext/installfiles/linux/zerotier-containerized/Dockerfile index f1fc45ed..e0ba5ca6 100644 --- a/ext/installfiles/linux/zerotier-containerized/Dockerfile +++ b/ext/installfiles/linux/zerotier-containerized/Dockerfile @@ -1,26 +1,30 @@ -FROM alpine:latest as builder -MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com> +FROM debian:stretch as builder + +## Supports x86_64, x86, arm, and arm64 + +RUN apt-get update && apt-get install -y curl gnupg +RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 0x1657198823e52a61 && \ + echo "deb http://download.zerotier.com/debian/stretch stretch main" > /etc/apt/sources.list.d/zerotier.list +RUN apt-get update && apt-get install -y zerotier-one=1.2.12 -ARG VERSION=1.2.12 -LABEL version=$VERSION -LABEL description="Containerized ZeroTier One" +FROM alpine:latest +MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com> -RUN apk add --update alpine-sdk linux-headers -RUN git clone https://github.com/zerotier/ZeroTierOne.git -WORKDIR ZeroTierOne -RUN git checkout $VERSION -RUN make +LABEL version="1.2.12" +LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts." -FROM alpine:latest as final +# Uncomment to build in container +#RUN apk add --update alpine-sdk linux-headers RUN apk add --update libgcc libstdc++ -COPY --from=builder /ZeroTierOne/zerotier-one / -RUN chmod 0755 /zerotier-one -RUN ln -sf /zerotier-one /zerotier-cli RUN mkdir -p /var/lib/zerotier-one +COPY --from=builder /var/lib/zerotier-one/zerotier-cli /usr/sbin/zerotier-cli +COPY --from=builder /var/lib/zerotier-one/zerotier-idtool /usr/sbin/zerotier-idtool +COPY --from=builder /usr/sbin/zerotier-one /usr/sbin/zerotier-one + ADD main.sh / RUN chmod 0755 /main.sh - -ENTRYPOINT /main.sh +ENTRYPOINT ["/main.sh"] +CMD ["zerotier-one"]
\ No newline at end of file diff --git a/ext/installfiles/linux/zerotier-containerized/main.sh b/ext/installfiles/linux/zerotier-containerized/main.sh index 685a6891..a3389039 100755 --- a/ext/installfiles/linux/zerotier-containerized/main.sh +++ b/ext/installfiles/linux/zerotier-containerized/main.sh @@ -7,4 +7,4 @@ if [ ! -e /dev/net/tun ]; then exit 1 fi -exec /zerotier-one +exec "$@" |