⬆️ Upgrades ZeroTier One to 1.6.0

hassio-addons · Nov 23, 2020 · 92a49b7 · 92a49b7
1 parent c3d4c3a
commit 92a49b7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 26 deletions.
diff --git a/zerotier/Dockerfile b/zerotier/Dockerfile
@@ -5,9 +5,6 @@ FROM ${BUILD_FROM}
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-# We need to copy in the patches need during build
-COPY rootfs/patches /patches
-
 # Setup base
 # hadolint ignore=DL3003
 RUN \
@@ -20,11 +17,10 @@ RUN \
         libgcc=9.3.0-r2 \
         libstdc++=9.3.0-r2 \
     \
-    && git clone --branch "1.4.6" --depth=1 \
+    && git clone --branch "1.6.0" --depth=1 \
         "https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \
     \
     && cd /tmp/zerotier \
-    && patch -p1 < /patches/ZeroTierOne/gcc9-compat.patch \
     && make \
     && make install \
     \

diff --git a/zerotier/rootfs/patches/ZeroTierOne/gcc9-compat.patch b/zerotier/rootfs/patches/ZeroTierOne/gcc9-compat.patch