Merge pull request #13 from dangeroustech/biodrone/issue9

Update ZeroTier Default Version
This commit is contained in:
2023-09-22 13:25:57 +01:00
committed by GitHub
2 changed files with 11 additions and 9 deletions

View File

@@ -1,17 +1,19 @@
FROM debian:buster as stage FROM debian:buster as stage
ARG PACKAGE_BASEURL=https://download.zerotier.com/debian/buster/pool/main/z/zerotier-one ARG PACKAGE_BASEURL=https://download.zerotier.com/debian/buster/pool/main/z/zerotier-one
ARG ARCH=amd64 ARG ARCH=amd64
ARG VERSION=1.6.6 ARG VERSION=1.12.2
RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y ca-certificates=20200601~deb10u2 curl=7.64.0-4+deb10u2 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" RUN curl -sSL -o zerotier-one.deb "${PACKAGE_BASEURL}/zerotier-one_${VERSION}_${ARCH}.deb"
FROM debian:buster FROM debian:buster
RUN mkdir /app
WORKDIR /app
COPY --from=stage zerotier-one.deb . 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 \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN dpkg -i zerotier-one.deb && rm -f zerotier-one.deb RUN dpkg -i zerotier-one.deb && rm -f zerotier-one.deb
RUN echo "${VERSION}" >/etc/zerotier-version RUN echo "${VERSION}" >/etc/zerotier-version
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh entrypoint.sh
RUN chmod 755 /entrypoint.sh RUN chmod 755 entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/app/entrypoint.sh"]

View File

@@ -1,4 +1,4 @@
version: '3' version: "3"
services: services:
zerotierbridge: zerotierbridge:
@@ -8,7 +8,7 @@ services:
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
ARCH: amd64 ARCH: amd64
VERSION: 1.6.6 VERSION: 1.12.2
restart: always restart: always
privileged: true privileged: true
volumes: volumes: