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

grocy/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}
 
@@ -9,34 +9,30 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # hadolint ignore=DL3003
 RUN \
     apk add --no-cache \
-        nginx=1.20.2-r0 \
+        composer=2.3.7-r0 \
+        nginx=1.22.0-r0 \
         patch=2.7.6-r7 \
-        php8-ctype=8.0.16-r0 \
-        php8-exif=8.0.16-r0 \
-        php8-fileinfo=8.0.16-r0 \
-        php8-fpm=8.0.16-r0 \
-        php8-gd=8.0.16-r0 \
-        php8-iconv=8.0.16-r0 \
-        php8-intl=8.0.16-r0 \
-        php8-ldap=8.0.16-r0 \
-        php8-mbstring=8.0.16-r0 \
-        php8-opcache=8.0.16-r0 \
-        php8-pdo_sqlite=8.0.16-r0 \
-        php8-pdo=8.0.16-r0 \
-        php8-simplexml=8.0.16-r0 \
-        php8-tokenizer=8.0.16-r0 \
-        php8=8.0.16-r0 \
-    \
-    && ln -s /usr/bin/php8 /usr/bin/php \
+        php8-ctype=8.0.19-r1 \
+        php8-exif=8.0.19-r1 \
+        php8-fileinfo=8.0.19-r1 \
+        php8-fpm=8.0.19-r1 \
+        php8-gd=8.0.19-r1 \
+        php8-iconv=8.0.19-r1 \
+        php8-intl=8.0.19-r1 \
+        php8-ldap=8.0.19-r1 \
+        php8-mbstring=8.0.19-r1 \
+        php8-opcache=8.0.19-r1 \
+        php8-pdo_sqlite=8.0.19-r1 \
+        php8-pdo=8.0.19-r1 \
+        php8-simplexml=8.0.19-r1 \
+        php8-tokenizer=8.0.19-r1 \
+        php8=8.0.19-r1 \
     \
     && apk add --no-cache --virtual .build-dependencies \
-        git=2.34.1-r0 \
-        php8-openssl=8.0.16-r0 \
-        php8-phar=8.0.16-r0 \
-        yarn=1.22.17-r0 \
-    \
-    && curl -sS https://getcomposer.org/installer \
-        | php -- --install-dir=/usr/local/bin --filename=composer \
+        git=2.36.1-r0 \
+        php8-openssl=8.0.19-r1 \
+        php8-phar=8.0.19-r1 \
+        yarn=1.22.19-r0 \
     \
     && yarn global add modclean \
     \

grocy/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

grocy/config.yaml

@@ -7,6 +7,7 @@ url: https://github.com/hassio-addons/addon-grocy
 codenotary: codenotary@frenck.dev
 ingress: true
 ingress_stream: true
+init: false
 panel_icon: mdi:cart
 panel_admin: false
 arch:

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

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Grocy
 # Sets up Grocy before the server starts

grocy/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: Grocy
 # Configures NGINX for use with Grocy

grocy/rootfs/etc/cont-init.d/php-fpm.sh

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

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

@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Grocy
 # Take down the S6 supervision tree when Nginx fails
 # ==============================================================================
-if { s6-test ${1} -ne 0 }
-if { s6-test ${1} -ne 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..."

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

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Grocy
 # Runs the Nginx daemon

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

@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Grocy
 # Take down the S6 supervision tree when PHP FPM fails
 # ==============================================================================
-if { s6-test ${1} -ne 0 }
-if { s6-test ${1} -ne 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..."

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

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Grocy
 # Runs the PHP-FPM daemon