Merge pull request #869 from bltavares/patch-2

Update ZeroTier version on Docker
This commit is contained in:
Adam Ierymenko 2018-11-28 08:41:42 -08:00 committed by GitHub
commit 65e0a74718
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions

View File

@ -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"]

View File

@ -7,4 +7,4 @@ if [ ! -e /dev/net/tun ]; then
exit 1
fi
exec /zerotier-one
exec "$@"