From 29c3e204769f043a4d1f80ebdc572b2b6809c6b2 Mon Sep 17 00:00:00 2001 From: red Date: Thu, 27 Jan 2022 20:09:08 +0100 Subject: [PATCH] revert original Dockerfile --- Dockerfile | 11 ++--------- README.md | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index e965bfa..643f648 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,21 +25,14 @@ LABEL org.opencontainers.image.title="zerotier" \ COPY --from=builder /src/zerotier-one /usr/sbin/ -RUN apk add --no-cache --purge --clean-protected --update libc6-compat libstdc++ supervisor iptables \ +RUN apk add --no-cache --purge --clean-protected --update libc6-compat libstdc++ \ && mkdir -p /var/lib/zerotier-one \ - && mkdir -p /var/log/supervisor \ && ln -s /usr/sbin/zerotier-one /usr/sbin/zerotier-idtool \ && ln -s /usr/sbin/zerotier-one /usr/sbin/zerotier-cli \ && rm -rf /var/cache/apk/* -ENV LOG_PATH=/var/log/supervisor \ - BRIDGE=false - -COPY conf /opt -COPY scripts /opt - EXPOSE 9993/udp -ENTRYPOINT ["/opt/entrypoint.sh"] +ENTRYPOINT ["zerotier-one"] CMD ["-U"] diff --git a/README.md b/README.md index 9b1b046..a692ce8 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ To enable it, remove the host network parameter and add `Bridge=true` to environ docker run --name zerotier-one --device=/dev/net/tun -e BRIDGE=true \ --cap-add=NET_ADMIN --cap-add=SYS_ADMIN \ - -v /var/lib/zerotier-one:/var/lib/zerotier-one zyclonite/zerotier + -v /var/lib/zerotier-one:/var/lib/zerotier-one zyclonite/zerotier-bridge That will start the zero-one, establish connection and build the bridge once the `zt` interface is up.