[pull] master from home-assistant:master

deconz/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 8.8.0
+
+- Upgrade base image from bookworm to trixie
+- Fix timestamps in log messages during shutdown
+
 ## 8.7.2
 
 - Bump deCONZ to 2.33.2 [[CHANGELOG](https://github.com/dresden-elektronik/deconz-rest-plugin/releases/tag/v2.33.2)]

deconz/Dockerfile

@@ -16,14 +16,14 @@ RUN \
         iputils-ping \
         kmod \
         libcap2-bin \
-        libqt5core5a \
-        libqt5gui5 \
-        libqt5network5 \
-        libqt5serialport5 \
-        libqt5sql5 \
-        libqt5websockets5 \
-        libqt5widgets5 \
-        libqt5qml5 \
+        libqt6gui6 \
+        libqt6network6 \
+        libqt6serialport6 \
+        libqt6sql6 \
+        libqt6websockets6 \
+        libqt6widgets6 \
+        libqt6qml6 \
+        libqt6core5compat6 \
         lsof \
         netcat-traditional \
         nginx \
@@ -43,9 +43,11 @@ RUN \
     set -x \
     && if [ "${BUILD_ARCH}" = "aarch64" ]; \
         then \
-            curl -q -L -o /deconz.deb http://deconz.dresden-elektronik.de/debian/stable/deconz_${DECONZ_VERSION}-debian-buster-stable_arm64.deb; \
+            curl -q -L -o /deconz.deb \
+                "https://github.com/dresden-elektronik/deconz-rest-plugin/releases/download/v${DECONZ_VERSION}/deconz-qt6_${DECONZ_VERSION}_arm64.deb"; \
         else \
-            curl -q -L -o /deconz.deb http://deconz.dresden-elektronik.de/ubuntu/stable/deconz-${DECONZ_VERSION}-qt5.deb; \
+            curl -q -L -o /deconz.deb \
+                "https://github.com/dresden-elektronik/deconz-rest-plugin/releases/download/v${DECONZ_VERSION}/deconz-qt6_${DECONZ_VERSION}_amd64.deb"; \
         fi \
     && dpkg -i /deconz.deb \
     && rm -f /deconz.deb \

deconz/build.yaml

@@ -1,6 +1,6 @@
 ---
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-base-debian:bookworm
-  amd64: ghcr.io/home-assistant/amd64-base-debian:bookworm
+  aarch64: ghcr.io/home-assistant/aarch64-base-debian:trixie
+  amd64: ghcr.io/home-assistant/amd64-base-debian:trixie
 args:
   DECONZ_VERSION: 2.33.2

deconz/config.yaml

@@ -1,5 +1,5 @@
 ---
-version: 8.7.2
+version: 8.8.0
 slug: deconz
 name: deCONZ
 description: >-

deconz/rootfs/etc/services.d/deconz/finish

@@ -1,4 +1,4 @@
-#!/usr/bin/env bashio
+#!/usr/bin/with-contenv bashio
 # vim: ft=bash
 # ==============================================================================
 # Take down the S6 supervision tree when service fails

deconz/rootfs/etc/services.d/deconz/run

@@ -6,6 +6,9 @@
 # ==============================================================================
 TMP_FOLDER=$(mktemp -d)
 
+# tigervnc >= 1.13 migrates ~/.vnc to ~/.config/tigervnc, which needs ~/.config to exist
+mkdir -p /data/.config
+
 # Lookup udev link
 DECONZ_DEVICE=$(bashio::config 'device')
 
@@ -38,8 +41,7 @@ tigervncserver \
     -localhost ${LOCAL_ONLY} \
     -SecurityTypes None \
     --I-KNOW-THIS-IS-INSECURE \
-    "${DISPLAY}" \
-    &> /dev/null
+    "${DISPLAY}"
 
 # Wait for VNC server to start before continuing
 bashio::log.info "deCONZ waiting for VNC to start"

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env bashio
+#!/usr/bin/with-contenv bashio
 # vim: ft=bash
 # ==============================================================================
 # Take down the S6 supervision tree when service fails