From e90175fe26befac5063c8cabfba4cd82bfc510de Mon Sep 17 00:00:00 2001 From: Philippe Delodder Date: Wed, 18 Oct 2023 11:35:39 +0000 Subject: [PATCH 1/5] Bump debian base image to 12.2-slim --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 749a5dd..3c6f659 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:11.5-slim +FROM debian:12.2-slim # Build arguments ARG VERSION From 2058b0d9c4b4375c11ac1b395e437d19a44da552 Mon Sep 17 00:00:00 2001 From: Philippe Delodder Date: Wed, 18 Oct 2023 11:39:17 +0000 Subject: [PATCH 2/5] Modify libssl --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3c6f659..d3fa9dc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -49,7 +49,7 @@ RUN apt-get update && \ libqt5websockets5 \ libqt5widgets5 \ libqt5qml5 \ - libssl1.1 \ + libssl \ lsof \ sqlite3 \ tigervnc-standalone-server \ From 56622a69d9f09031135cd97980795577fe591b14 Mon Sep 17 00:00:00 2001 From: Philippe Delodder Date: Wed, 18 Oct 2023 11:41:18 +0000 Subject: [PATCH 3/5] Modify to libssl3 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index d3fa9dc..8ec6cd6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -49,7 +49,7 @@ RUN apt-get update && \ libqt5websockets5 \ libqt5widgets5 \ libqt5qml5 \ - libssl \ + libssl3 \ lsof \ sqlite3 \ tigervnc-standalone-server \ From 607e8b52eff930efb3cfa2ebd25624f9566bb58c Mon Sep 17 00:00:00 2001 From: senilio Date: Wed, 18 Oct 2023 21:12:20 +0200 Subject: [PATCH 4/5] Update firmware-update.sh --- docker/root/firmware-update.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/docker/root/firmware-update.sh b/docker/root/firmware-update.sh index 1d7a868..c9e2191 100644 --- a/docker/root/firmware-update.sh +++ b/docker/root/firmware-update.sh @@ -3,23 +3,20 @@ # =========================== # Configuration # =========================== -VERSION=0.8 +VERSION=0.9 # --------------------------- # Flasher and options # --------------------------- FLASHER=/usr/bin/GCFFlasher_internal -FLASHER_PARAM_LIST=( -d -f -s -t -R -B -x ) +FLASHER_PARAM_LIST=( -d -f -t -x ) typeset -A FLASHER_PARAM_NAMES=( # GCFFlasher # -r force device reset without programming [-f]="Firmware file" # -f flash firmware file [-d]="Device path ." # -d device number or path to use, e.g. 0, /dev/ttyUSB0 or RaspBee - [-s]="Serial number" # -s serial number to use + [-c]="Debug serial " # -c connect and debug serial protocol [-t]="Timeout ....." # -t retry until timeout (seconds) is reached - [-R]="Retries ....." # -R max. retries - [-B]="Baudrate ...." # -B custom baudrate # -l list devices [-x]="Loglevel ...." # -x debug log level 0, 1, 3 - # -j runs a test 1 # -h -? print this help ) typeset -A FLASHER_PARAM_PRINT=( @@ -35,7 +32,7 @@ typeset -A FLASHER_PARAM_VALUES=( # --------------------------- # Firmware details # --------------------------- -FW_PATH=/usr/share/deCONZ/firmware/ +FW_PATH=/tmp typeset -A FW_ONLINE_BASES=( [stable]="http://deconz.dresden-elektronik.de/deconz-firmware/" [beta]="http://deconz.dresden-elektronik.de/deconz-firmware/beta/" From 51573d96f6cf87964ecb4f5fa6be97b6c7c48062 Mon Sep 17 00:00:00 2001 From: senilio Date: Thu, 19 Oct 2023 09:13:24 +0200 Subject: [PATCH 5/5] Install udev as udevadm is needed by v4 of GCFFlasher --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8ec6cd6..cb78320 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -39,6 +39,7 @@ RUN apt-get update && \ gosu \ curl \ kmod \ + udev \ libatomic1 \ libcap2-bin \ libqt5core5a \ @@ -49,7 +50,7 @@ RUN apt-get update && \ libqt5websockets5 \ libqt5widgets5 \ libqt5qml5 \ - libssl3 \ + libssl3 \ lsof \ sqlite3 \ tigervnc-standalone-server \