mirror of
https://github.com/hassio-addons/addon-zerotier.git
synced 2025-05-04 19:21:25 +00:00
⬆️ Upgrades add-on base image to 12.0.0
This commit is contained in:
parent
97b5e4d648
commit
ee21381cc1
5 changed files with 20 additions and 18 deletions
|
@ -1,4 +1,4 @@
|
||||||
ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:11.1.2
|
ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0
|
||||||
# hadolint ignore=DL3006
|
# hadolint ignore=DL3006
|
||||||
FROM ${BUILD_FROM}
|
FROM ${BUILD_FROM}
|
||||||
|
|
||||||
|
@ -10,15 +10,15 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
RUN \
|
RUN \
|
||||||
apk add --no-cache --virtual .build-dependencies \
|
apk add --no-cache --virtual .build-dependencies \
|
||||||
build-base=0.5-r2 \
|
build-base=0.5-r2 \
|
||||||
cargo=1.56.1-r0 \
|
cargo=1.60.0-r2 \
|
||||||
git=2.34.2-r0 \
|
git=2.36.1-r0 \
|
||||||
linux-headers=5.10.41-r0 \
|
linux-headers=5.16.7-r1 \
|
||||||
openssl-dev=1.1.1n-r0 \
|
openssl-dev=1.1.1o-r0 \
|
||||||
pkgconf=1.8.0-r0 \
|
pkgconf=1.8.0-r0 \
|
||||||
\
|
\
|
||||||
&& apk add --no-cache \
|
&& apk add --no-cache \
|
||||||
libgcc=10.3.1_git20211027-r0 \
|
libgcc=11.2.1_git20220219-r2 \
|
||||||
libstdc++=10.3.1_git20211027-r0 \
|
libstdc++=11.2.1_git20220219-r2 \
|
||||||
\
|
\
|
||||||
&& git clone --branch "1.8.9" --depth=1 \
|
&& git clone --branch "1.8.9" --depth=1 \
|
||||||
"https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \
|
"https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
---
|
---
|
||||||
build_from:
|
build_from:
|
||||||
aarch64: ghcr.io/hassio-addons/base/aarch64:11.1.2
|
aarch64: ghcr.io/hassio-addons/base/aarch64:12.0.0
|
||||||
amd64: ghcr.io/hassio-addons/base/amd64:11.1.2
|
amd64: ghcr.io/hassio-addons/base/amd64:12.0.0
|
||||||
armhf: ghcr.io/hassio-addons/base/armhf:11.1.2
|
armhf: ghcr.io/hassio-addons/base/armhf:12.0.0
|
||||||
armv7: ghcr.io/hassio-addons/base/armv7:11.1.2
|
armv7: ghcr.io/hassio-addons/base/armv7:12.0.0
|
||||||
i386: ghcr.io/hassio-addons/base/i386:11.1.2
|
i386: ghcr.io/hassio-addons/base/i386:12.0.0
|
||||||
codenotary:
|
codenotary:
|
||||||
base_image: codenotary@frenck.dev
|
base_image: codenotary@frenck.dev
|
||||||
signer: codenotary@frenck.dev
|
signer: codenotary@frenck.dev
|
||||||
|
|
2
zerotier/rootfs/etc/cont-init.d/zerotier.sh
Normal file → Executable file
2
zerotier/rootfs/etc/cont-init.d/zerotier.sh
Normal file → Executable file
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/with-contenv bashio
|
#!/command/with-contenv bashio
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# Home Assistant Community Add-on: ZeroTier One
|
# Home Assistant Community Add-on: ZeroTier One
|
||||||
# Generates an identiy in case it does not exists yet
|
# Generates an identiy in case it does not exists yet
|
||||||
|
|
10
zerotier/rootfs/etc/services.d/zerotier/finish
Normal file → Executable file
10
zerotier/rootfs/etc/services.d/zerotier/finish
Normal file → Executable file
|
@ -1,9 +1,11 @@
|
||||||
#!/usr/bin/execlineb -S0
|
#!/command/with-contenv bashio
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# Home Assistant Community Add-on: ZeroTier One
|
# Home Assistant Community Add-on: ZeroTier One
|
||||||
# Take down the S6 supervision tree when ZeroTier fails
|
# Take down the S6 supervision tree when ZeroTier fails
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
if -n { s6-test $# -ne 0 }
|
if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
|
||||||
if -n { s6-test ${1} -eq 256 }
|
bashio::log.warning "ZeroTier crashed, halting add-on"
|
||||||
|
/run/s6/basedir/bin/halt
|
||||||
|
fi
|
||||||
|
|
||||||
s6-svscanctl -t /var/run/s6/services
|
bashio::log.info "ZeroTier stopped, restarting..."
|
||||||
|
|
2
zerotier/rootfs/etc/services.d/zerotier/run
Normal file → Executable file
2
zerotier/rootfs/etc/services.d/zerotier/run
Normal file → Executable file
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/with-contenv bashio
|
#!/command/with-contenv bashio
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# Home Assistant Community Add-on: ZeroTier One
|
# Home Assistant Community Add-on: ZeroTier One
|
||||||
# Runs ZeroTier One
|
# Runs ZeroTier One
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue