⬆️ Upgrades add-on base image to 12.0.0 (#240)

tasmoadmin/Dockerfile

@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:11.1.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -8,17 +8,16 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Setup base
 RUN \
     apk add --no-cache \
-        nginx=1.20.2-r0 \
-        php7-curl=7.4.28-r0 \
-        php7-fpm=7.4.28-r0 \
-        php7-json=7.4.28-r0 \
-        php7-opcache=7.4.28-r0 \
-        php7-session=7.4.28-r0 \
-        php7-zip=7.4.28-r0 \
-        php7=7.4.28-r0 \
+        nginx=1.22.0-r0 \
+        php8-curl=8.0.19-r1 \
+        php8-fpm=8.0.19-r1 \
+        php8-opcache=8.0.19-r1 \
+        php8-session=8.0.19-r1 \
+        php8-zip=8.0.19-r1 \
+        php8=8.0.19-r1 \
     \
     && apk add --no-cache --virtual .build-dependencies \
-        git=2.34.1-r0 \
+        git=2.36.1-r0 \
     \
     && git clone --branch v1.8.0 --depth=1 \
         https://github.com/reloxx13/TasmoAdmin.git /var/www/tasmoadmin \

tasmoadmin/build.yaml

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

tasmoadmin/rootfs/etc/cont-init.d/nginx.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: TasmoAdmin
 # Configures NGINX for use with TasmoAdmin

tasmoadmin/rootfs/etc/cont-init.d/tasmoadmin.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: TasmoAdmin
 # Configures TasmoAdmin

tasmoadmin/rootfs/etc/fix-attrs.d/01-tasmoadmin

@@ -1,2 +0,0 @@
-/var/www/tasmoadmin true nginx 0644 0755
-/data/tasmoadmin true nginx 0644 0755

tasmoadmin/rootfs/etc/php8/php-fpm.d/www.conf

@@ -1,6 +1,6 @@
 [www]
-user = nginx
-group = nginx
+user = root
+group = root
 listen = 127.0.0.1:9001
 pm = dynamic
 pm.max_children = 10

tasmoadmin/rootfs/etc/services.d/nginx/finish

@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: TasmoAdmin
-# Take down the S6 supervision tree when Nginx fails
+# Take down the S6 supervision tree when NGINX fails
 # ==============================================================================
-if -n { s6-test $# -ne 0 }
-if -n { s6-test ${1} -eq 256 }
+if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
+  bashio::log.warning "NGINX crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "NGINX stopped, restarting..."

tasmoadmin/rootfs/etc/services.d/nginx/run

@@ -1,9 +1,9 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: TasmoAdmin
 # Runs the Nginx daemon
 # ==============================================================================
 # Wait for PHP-FPM to become available
 bashio::net.wait_for 9001
-bashio::log.info "Starting NGinx server..."
+bashio::log.info "Starting NGINX server..."
 exec nginx -g "daemon off;"

tasmoadmin/rootfs/etc/services.d/php-fpm/finish

@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: TasmoAdmin
 # Take down the S6 supervision tree when PHP FPM fails
 # ==============================================================================
-if -n { s6-test $# -ne 0 }
-if -n { s6-test ${1} -eq 256 }
+if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
+  bashio::log.warning "PHP-FPM crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "PHP-FPM stopped, restarting..."

tasmoadmin/rootfs/etc/services.d/php-fpm/run

@@ -1,7 +1,7 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: TasmoAdmin
 # Runs the PHP-FPM daemon
 # ==============================================================================
 bashio::log.info "Starting PHP-FPM server..."
-exec php-fpm7 --nodaemonize
+exec php-fpm8 -R --nodaemonize