diff --git a/Dockerfile b/Dockerfile index c5511ea..e072e52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,19 @@ FROM debian:buster as stage ARG PACKAGE_BASEURL=https://download.zerotier.com/debian/buster/pool/main/z/zerotier-one ARG ARCH=amd64 -ARG VERSION=1.6.6 -RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y ca-certificates=20200601~deb10u2 curl=7.64.0-4+deb10u2 +ARG VERSION=1.12.2 +RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y ca-certificates curl RUN curl -sSL -o zerotier-one.deb "${PACKAGE_BASEURL}/zerotier-one_${VERSION}_${ARCH}.deb" FROM debian:buster +RUN mkdir /app +WORKDIR /app COPY --from=stage zerotier-one.deb . -RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y procps=2:3.3.15-2 iptables=1.8.2-4 \ +RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y procps iptables openssl \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* RUN dpkg -i zerotier-one.deb && rm -f zerotier-one.deb RUN echo "${VERSION}" >/etc/zerotier-version -COPY entrypoint.sh /entrypoint.sh -RUN chmod 755 /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] +COPY entrypoint.sh entrypoint.sh +RUN chmod 755 entrypoint.sh +ENTRYPOINT ["/app/entrypoint.sh"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index f6e8456..2130417 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: "3" services: zerotierbridge: @@ -8,7 +8,7 @@ services: dockerfile: Dockerfile args: ARCH: amd64 - VERSION: 1.6.6 + VERSION: 1.12.2 restart: always privileged: true volumes: @@ -17,4 +17,4 @@ services: - ZT_NETWORKS=NETWORK_ID_1 NETWORK_ID_2 NETWORK_ID_3 - ZT_BRIDGE=true volumes: - zt_config: \ No newline at end of file + zt_config: