From 8544501aa8d80e7be214191745d19cda0a5b747e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 9 Mar 2022 19:34:32 +0100 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ZeroTier=20One?= =?UTF-8?q?=20to=201.8.5=20(#141)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zerotier/Dockerfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/zerotier/Dockerfile b/zerotier/Dockerfile index e276960..17a2282 100755 --- a/zerotier/Dockerfile +++ b/zerotier/Dockerfile @@ -10,14 +10,17 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN \ apk add --no-cache --virtual .build-dependencies \ build-base=0.5-r2 \ - linux-headers=5.10.41-r0 \ + cargo=1.56.1-r0 \ git=2.34.1-r0 \ + linux-headers=5.10.41-r0 \ + openssl-dev=1.1.1l-r8 \ + pkgconf=1.8.0-r0 \ \ && apk add --no-cache \ libgcc=10.3.1_git20211027-r0 \ libstdc++=10.3.1_git20211027-r0 \ \ - && git clone --branch "1.8.4" --depth=1 \ + && git clone --branch "1.8.5" --depth=1 \ "https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \ \ && cd /tmp/zerotier \ @@ -25,7 +28,9 @@ RUN \ && make install \ \ && apk del --no-cache --purge .build-dependencies \ - && rm -f -r /tmp/* + && rm -f -r \ + /root/.cargo \ + /tmp/* # Copy root filesystem COPY rootfs /