Merge pull request #76 from mdegat01/update-addon-base-6.1.1

Update addon debian base to 6.1.1

amr2mqtt/build.yaml

@@ -1,9 +1,9 @@
 ---
 build_from:
-  amd64: ghcr.io/hassio-addons/debian-base/amd64:5.3.1
-  armhf: ghcr.io/hassio-addons/debian-base/armhf:5.3.1
-  armv7: ghcr.io/hassio-addons/debian-base/armv7:5.3.1
-  aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.3.1
+  amd64: ghcr.io/hassio-addons/debian-base/amd64:6.1.1
+  armhf: ghcr.io/hassio-addons/debian-base/armhf:6.1.1
+  armv7: ghcr.io/hassio-addons/debian-base/armv7:6.1.1
+  aarch64: ghcr.io/hassio-addons/debian-base/aarch64:6.1.1
 codenotary:
   base_image: [email protected]
   signer: [email protected]

amr2mqtt/config.yaml

@@ -10,6 +10,7 @@ arch:
   - armhf
 description: AMR2MQTT for Home Assistant
 codenotary: [email protected]
+init: false
 uart: true
 udev: true
 usb: true

amr2mqtt/rootfs/etc/services.d/amr2mqtt/finish

@@ -1,9 +1,15 @@
-#!/usr/bin/execlineb -S0
+#!/usr/bin/env bashio
 # ==============================================================================
 # Home Assistant Add-on: AMR2MQTT
 # Take down the S6 supervision tree when AMR2MQTT fails
 # ==============================================================================
-if { s6-test ${1} -ne 0 }
-if { s6-test ${1} -ne 256 }
 
-s6-svscanctl -t /var/run/s6/service
+declare APP_EXIT_CODE=${1}
+
+if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
+  bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
+  echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
+  exec /run/s6/basedir/bin/halt
+fi
+
+bashio::log.info "Service restart after closing"