summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2019-07-29 10:22:36 -0700
committerGitHub <noreply@github.com>2019-07-29 10:22:36 -0700
commit1e475edd1c2243781bb3538014b366884b7c8ee1 (patch)
tree08417dd50b911c4771ac5623fb480d0f562790bd /ext
parent745483708acf13a86889c18a83343c5f12d4a653 (diff)
parentdaa88390057f2f84d4304a14d17c383f41708795 (diff)
downloadinfinitytier-1e475edd1c2243781bb3538014b366884b7c8ee1.tar.gz
infinitytier-1e475edd1c2243781bb3538014b366884b7c8ee1.zip
Merge pull request #973 from unquietwiki/patch-1
Update Dockerfile
Diffstat (limited to 'ext')
-rw-r--r--ext/installfiles/linux/zerotier-containerized/Dockerfile24
1 files changed, 13 insertions, 11 deletions
diff --git a/ext/installfiles/linux/zerotier-containerized/Dockerfile b/ext/installfiles/linux/zerotier-containerized/Dockerfile
index e0ba5ca6..fd18eebb 100644
--- a/ext/installfiles/linux/zerotier-containerized/Dockerfile
+++ b/ext/installfiles/linux/zerotier-containerized/Dockerfile
@@ -1,30 +1,32 @@
-FROM debian:stretch as builder
+## NOTE: to retain configuration; mount a Docker volume, or use a bind-mount, on /var/lib/zerotier-one
+
+FROM debian:buster-slim 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
+ echo "deb http://download.zerotier.com/debian/buster buster main" > /etc/apt/sources.list.d/zerotier.list
RUN apt-get update && apt-get install -y zerotier-one=1.2.12
+RUN curl https://raw.githubusercontent.com/zerotier/ZeroTierOne/master/ext/installfiles/linux/zerotier-containerized/main.sh > /var/lib/zerotier-one/main.sh
FROM alpine:latest
-MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
-
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
-#RUN apk add --update alpine-sdk linux-headers
-
+# RUN apk add --update alpine-sdk linux-headers
RUN apk add --update libgcc libstdc++
-RUN mkdir -p /var/lib/zerotier-one
+# ZeroTier relies on UDP port 9993
+EXPOSE 9993/udp
-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
+RUN mkdir -p /var/lib/zerotier-one
+COPY --from=builder /usr/sbin/zerotier-cli /usr/sbin/zerotier-cli
+COPY --from=builder /usr/sbin/zerotier-idtool /usr/sbin/zerotier-idtool
COPY --from=builder /usr/sbin/zerotier-one /usr/sbin/zerotier-one
+COPY --from=builder /var/lib/zerotier-one/main.sh /main.sh
-ADD main.sh /
RUN chmod 0755 /main.sh
ENTRYPOINT ["/main.sh"]
-CMD ["zerotier-one"] \ No newline at end of file
+CMD ["zerotier-one"]