From 385a3996d7e83914e7e5874cfed449f751755493 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Sun, 24 Jan 2021 22:30:01 +0100
Subject: [PATCH 1/2] Upgrade add-on base image to 9.1.0

---
 zerotier/Dockerfile  | 10 +++++-----
 zerotier/build.json  | 10 +++++-----
 zerotier/config.json |  1 -
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/zerotier/Dockerfile b/zerotier/Dockerfile
index 8276ee1..c13c109 100755
--- a/zerotier/Dockerfile
+++ b/zerotier/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/base:8.0.6
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.1.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -13,12 +13,12 @@ COPY rootfs/patches /patches
 RUN \
     apk add --no-cache --virtual .build-dependencies \
         build-base=0.5-r2 \
-        linux-headers=5.4.5-r1 \
-        git=2.26.2-r0 \
+        linux-headers=5.7.8-r0 \
+        git=2.30.0-r0 \
     \
     && apk add --no-cache \
-        libgcc=9.3.0-r2 \
-        libstdc++=9.3.0-r2 \
+        libgcc=10.2.1_pre1-r3 \
+        libstdc++=10.2.1_pre1-r3 \
     \
     && git clone --branch "1.4.6" --depth=1 \
         "https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \
diff --git a/zerotier/build.json b/zerotier/build.json
index 56b0309..07898b0 100644
--- a/zerotier/build.json
+++ b/zerotier/build.json
@@ -1,9 +1,9 @@
 {
   "build_from": {
-    "aarch64": "hassioaddons/base-aarch64:8.0.6",
-    "amd64": "hassioaddons/base-amd64:8.0.6",
-    "armhf": "hassioaddons/base-armhf:8.0.6",
-    "armv7": "hassioaddons/base-armv7:8.0.6",
-    "i386": "hassioaddons/base-i386:8.0.6"
+    "aarch64": "ghcr.io/hassio-addons/base/aarch64:9.1.0",
+    "amd64": "ghcr.io/hassio-addons/base/amd64:9.1.0",
+    "armhf": "ghcr.io/hassio-addons/base/armhf:9.1.0",
+    "armv7": "ghcr.io/hassio-addons/base/armv7:9.1.0",
+    "i386": "ghcr.io/hassio-addons/base/i386:9.1.0"
   }
 }
diff --git a/zerotier/config.json b/zerotier/config.json
index 6832669..8b4e955 100755
--- a/zerotier/config.json
+++ b/zerotier/config.json
@@ -13,7 +13,6 @@
   "ports_description": {
     "9993/tcp": "ZeroTier's primary port"
   },
-  "hassio_api": true,
   "host_network": true,
   "privileged": ["NET_ADMIN", "SYS_ADMIN"],
   "devices": ["/dev/net/tun:/dev/net/tun:rwm"],

From 1ccc4558343ebb2e066a936c9382bb917f6549b2 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Mon, 1 Feb 2021 23:49:36 +0100
Subject: [PATCH 2/2] Upgrade add-on base image to 9.1.2

---
 zerotier/Dockerfile |  2 +-
 zerotier/build.json | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/zerotier/Dockerfile b/zerotier/Dockerfile
index c13c109..8231e40 100755
--- a/zerotier/Dockerfile
+++ b/zerotier/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.1.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.1.2
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/zerotier/build.json b/zerotier/build.json
index 07898b0..aff97fb 100644
--- a/zerotier/build.json
+++ b/zerotier/build.json
@@ -1,9 +1,9 @@
 {
   "build_from": {
-    "aarch64": "ghcr.io/hassio-addons/base/aarch64:9.1.0",
-    "amd64": "ghcr.io/hassio-addons/base/amd64:9.1.0",
-    "armhf": "ghcr.io/hassio-addons/base/armhf:9.1.0",
-    "armv7": "ghcr.io/hassio-addons/base/armv7:9.1.0",
-    "i386": "ghcr.io/hassio-addons/base/i386:9.1.0"
+    "aarch64": "ghcr.io/hassio-addons/base/aarch64:9.1.2",
+    "amd64": "ghcr.io/hassio-addons/base/amd64:9.1.2",
+    "armhf": "ghcr.io/hassio-addons/base/armhf:9.1.2",
+    "armv7": "ghcr.io/hassio-addons/base/armv7:9.1.2",
+    "i386": "ghcr.io/hassio-addons/base/i386:9.1.2"
   }
 }