revert original Dockerfile

This commit is contained in:
red 2022-01-27 20:09:08 +01:00
parent 3a6dd5f573
commit 29c3e20476
2 changed files with 3 additions and 10 deletions

View File

@ -25,21 +25,14 @@ LABEL org.opencontainers.image.title="zerotier" \
COPY --from=builder /src/zerotier-one /usr/sbin/ 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/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-idtool \
&& ln -s /usr/sbin/zerotier-one /usr/sbin/zerotier-cli \ && ln -s /usr/sbin/zerotier-one /usr/sbin/zerotier-cli \
&& rm -rf /var/cache/apk/* && rm -rf /var/cache/apk/*
ENV LOG_PATH=/var/log/supervisor \
BRIDGE=false
COPY conf /opt
COPY scripts /opt
EXPOSE 9993/udp EXPOSE 9993/udp
ENTRYPOINT ["/opt/entrypoint.sh"] ENTRYPOINT ["zerotier-one"]
CMD ["-U"] CMD ["-U"]

View File

@ -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 \ docker run --name zerotier-one --device=/dev/net/tun -e BRIDGE=true \
--cap-add=NET_ADMIN --cap-add=SYS_ADMIN \ --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. That will start the zero-one, establish connection and build the bridge once the `zt` interface is up.