🔨 Migrate old-style base scripts s6-rc (#163)

zerotier/DOCS.md

@@ -26,12 +26,6 @@ comparison to installing any other Home Assistant add-on.
 1. Check the logs of the "ZeroTier One" add-on to see if everything went well.
 1. The instance will show up in your ZeroTier account.
 
-Home Assistant, by default, ships with the Community Add-ons store installed.
-However, if it is missing (for any reason), you can add it by clicking the
-button My button below.
-
-[![Add repository to your Home Assitant instance.][repository-badge]][repository]
-
 ## Configuration
 
 **Note**: _Remember to restart the add-on when the configuration is changed._
@@ -145,7 +139,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 [addon-badge]: https://my.home-assistant.io/badges/supervisor_addon.svg
-[addon]: https://my.home-assistant.io/redirect/supervisor_addon/?addon=a0d7b954_zerotier
+[addon]: https://my.home-assistant.io/redirect/supervisor_addon/?addon=a0d7b954_zerotier&repository_url=https%3A%2F%2Fgithub.com%2Fhassio-addons%2Frepository
 [api]: https://www.zerotier.com/manual.shtml#4_1
 [contributors]: https://github.com/hassio-addons/addon-zerotier/graphs/contributors
 [discord-ha]: https://discord.gg/c5DvZ4e
@@ -155,7 +149,5 @@ SOFTWARE.
 [issue]: https://github.com/hassio-addons/addon-zerotier/issues
 [reddit]: https://reddit.com/r/homeassistant
 [releases]: https://github.com/hassio-addons/addon-zerotier/releases
-[repository-badge]: https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg
-[repository]: https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Fhassio-addons%2Frepository
 [semver]: http://semver.org/spec/v2.0.0.htm
 [zerotier]: https://www.zerotier.com/

zerotier/Dockerfile

@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:11.1.2
+ARG BUILD_FROM=ghcr.io/hassio-addons/base:13.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -9,22 +9,22 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # hadolint ignore=DL3003
 RUN \
     apk add --no-cache --virtual .build-dependencies \
-        build-base=0.5-r2 \
-        cargo=1.56.1-r0 \
-        git=2.34.2-r0 \
-        linux-headers=5.10.41-r0 \
-        openssl-dev=1.1.1n-r0 \
-        pkgconf=1.8.0-r0 \
+        build-base=0.5-r3 \
+        cargo=1.64.0-r2 \
+        git=2.38.2-r0 \
+        linux-headers=5.19.5-r0 \
+        openssl-dev=3.0.7-r0 \
+        pkgconf=1.9.3-r0 \
     \
     && apk add --no-cache \
-        libgcc=10.3.1_git20211027-r0 \
-        libstdc++=10.3.1_git20211027-r0 \
+        libgcc=12.2.1_git20220924-r4 \
+        libstdc++=12.2.1_git20220924-r4 \
     \
-    && git clone --branch "1.8.9" --depth=1 \
+    && git clone --branch "1.10.2" --depth=1 \
         "https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \
     \
     && cd /tmp/zerotier \
-    && make \
+    && CARGO_NET_GIT_FETCH_WITH_CLI=true make \
     && make install \
     \
     && apk del --no-cache --purge .build-dependencies \

zerotier/build.yaml

@@ -1,10 +1,10 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/base/aarch64:11.1.2
-  amd64: ghcr.io/hassio-addons/base/amd64:11.1.2
-  armhf: ghcr.io/hassio-addons/base/armhf:11.1.2
-  armv7: ghcr.io/hassio-addons/base/armv7:11.1.2
-  i386: ghcr.io/hassio-addons/base/i386:11.1.2
+  aarch64: ghcr.io/hassio-addons/base:13.0.0
+  amd64: ghcr.io/hassio-addons/base:13.0.0
+  armhf: ghcr.io/hassio-addons/base:13.0.0
+  armv7: ghcr.io/hassio-addons/base:13.0.0
+  i386: ghcr.io/hassio-addons/base:13.0.0
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev

zerotier/rootfs/etc/s6-overlay/s6-rc.d/init-zerotier/run

@@ -1,4 +1,5 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: ZeroTier One
 # Generates an identiy in case it does not exists yet

zerotier/rootfs/etc/s6-overlay/s6-rc.d/init-zerotier/type

@@ -0,0 +1 @@
+oneshot

zerotier/rootfs/etc/s6-overlay/s6-rc.d/init-zerotier/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-zerotier/run

zerotier/rootfs/etc/s6-overlay/s6-rc.d/zerotier/finish

@@ -0,0 +1,27 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Community Add-on: ZeroTier One
+# Take down the S6 supervision tree when ZeroTier fails
+# ==============================================================================
+declare exit_code
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+readonly service="ZeroTier One"
+
+bashio::log.info \
+  "Service ${service} exited with code ${exit_code_service}" \
+  "(by signal ${exit_code_signal})"
+
+if [[ "${exit_code_service}" -eq 256 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+  fi
+  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
+  fi
+  exec /run/s6/basedir/bin/halt
+fi

zerotier/rootfs/etc/s6-overlay/s6-rc.d/zerotier/run

@@ -1,4 +1,5 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: ZeroTier One
 # Runs ZeroTier One

zerotier/rootfs/etc/s6-overlay/s6-rc.d/zerotier/type

@@ -0,0 +1 @@
+longrun

zerotier/rootfs/etc/services.d/zerotier/finish

@@ -1,9 +0,0 @@
-#!/usr/bin/execlineb -S0
-# ==============================================================================
-# Home Assistant Community Add-on: ZeroTier One
-# Take down the S6 supervision tree when ZeroTier fails
-# ==============================================================================
-if -n { s6-test $# -ne 0 }
-if -n { s6-test ${1} -eq 256 }
-
-s6-svscanctl -t /var/run/s6/services