From 2a2eee740dae5f5b5b5ced4b823f84e670a61518 Mon Sep 17 00:00:00 2001
From: Philippe Delodder <7259755+phdelodder@users.noreply.github.com>
Date: Sat, 18 Nov 2023 09:35:59 +0100
Subject: [PATCH] Bump debian base image to 12.2-slim (#212)

* Bump debian base image to 12.2-slim

* Modify libssl

* Modify to libssl3

* Update firmware-update.sh

* Install udev as udevadm is needed by v4 of GCFFlasher

---------

Co-authored-by: senilio <emil@melt.se>
Co-authored-by: senilio <git@melt.se>
Co-authored-by: Emil Petersson <senilio@users.noreply.github.com>
---
 docker/Dockerfile              |  5 +++--
 docker/root/firmware-update.sh | 11 ++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3c267f6..4237b27 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
@@ -40,6 +40,7 @@ RUN apt-get update && \
         gosu \
         curl \
         kmod \
+        udev \
         libatomic1 \
         libcap2-bin \
         libqt5core5a \
@@ -50,7 +51,7 @@ RUN apt-get update && \
         libqt5websockets5 \
         libqt5widgets5 \
         libqt5qml5 \
-        libssl1.1 \
+        libssl3 \
         lsof \
         sqlite3 \
         tigervnc-standalone-server \
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 <options>
                                  #  -r              force device reset without programming
     [-f]="Firmware file"         #  -f <firmware>   flash firmware file
     [-d]="Device path ."         #  -d <device>     device number or path to use, e.g. 0, /dev/ttyUSB0 or RaspBee
-    [-s]="Serial number"         #  -s <serial>     serial number to use
+    [-c]="Debug serial "         #  -c              connect and debug serial protocol
     [-t]="Timeout ....."         #  -t <timeout>    retry until timeout (seconds) is reached
-    [-R]="Retries ....."         #  -R <retries>    max. retries
-    [-B]="Baudrate ...."         #  -B <baudrate>   custom baudrate
                                  #  -l              list devices
     [-x]="Loglevel ...."         #  -x <loglevel>   debug log level 0, 1, 3
-                                 #  -j <test>       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/"