diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2018-11-28 08:41:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 08:41:42 -0800 |
| commit | 65e0a747183214396eb2b8cf5a2cb4dec64b1987 (patch) | |
| tree | 2e7e60f96c176057ea293586b35b39a01e90cecc | |
| parent | 133b64679c5423a20c407ad8a5d713a58ced38e1 (diff) | |
| parent | 2d21c18ebdacc1c011831c19c162e795c0fe6dde (diff) | |
| download | infinitytier-65e0a747183214396eb2b8cf5a2cb4dec64b1987.tar.gz infinitytier-65e0a747183214396eb2b8cf5a2cb4dec64b1987.zip | |
Merge pull request #869 from bltavares/patch-2
Update ZeroTier version on Docker
| -rw-r--r-- | ext/installfiles/linux/zerotier-containerized/Dockerfile | 22 | ||||
| -rwxr-xr-x | ext/installfiles/linux/zerotier-containerized/main.sh | 2 |
2 files changed, 17 insertions, 7 deletions
diff --git a/ext/installfiles/linux/zerotier-containerized/Dockerfile b/ext/installfiles/linux/zerotier-containerized/Dockerfile index 85faace0..e0ba5ca6 100644 --- a/ext/installfiles/linux/zerotier-containerized/Dockerfile +++ b/ext/installfiles/linux/zerotier-containerized/Dockerfile @@ -1,7 +1,16 @@ +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 + FROM alpine:latest MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com> -LABEL version="1.2.4" +LABEL version="1.2.12" LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts." # Uncomment to build in container @@ -9,12 +18,13 @@ LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker- RUN apk add --update libgcc libstdc++ -ADD 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 "$@" |