Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump debian base image to 12.2-slim #212

Merged
merged 6 commits into from
Nov 18, 2023
Merged

Bump debian base image to 12.2-slim #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e90175f
Bump debian base image to 12.2-slim
phdelodder Oct 18, 2023
2058b0d
Modify libssl
phdelodder Oct 18, 2023
56622a6
Modify to libssl3
phdelodder Oct 18, 2023
607e8b5
Update firmware-update.sh
senilio Oct 18, 2023
51573d9
Install udev as udevadm is needed by v4 of GCFFlasher
senilio Oct 19, 2023
e4972bc
Merge pull request #213 from deconz-community/firmware-update-fix
senilio Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:11.5-slim
FROM debian:12.2-slim

# Build arguments
ARG VERSION
Expand Down Expand Up @@ -39,6 +39,7 @@ RUN apt-get update && \
gosu \
curl \
kmod \
udev \
libatomic1 \
libcap2-bin \
libqt5core5a \
Expand All @@ -49,7 +50,7 @@ RUN apt-get update && \
libqt5websockets5 \
libqt5widgets5 \
libqt5qml5 \
libssl1.1 \
libssl3 \
lsof \
sqlite3 \
tigervnc-standalone-server \
Expand Down
11 changes: 4 additions & 7 deletions docker/root/firmware-update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand All @@ -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/"
Expand Down
Loading