From 7c2e11abad5677ba9954590127c0dc3ba012d4e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 14 Sep 2025 20:52:29 +0000 Subject: [PATCH 1/4] chore(deps): update debian docker tag to v13 --- docker/klipper/Dockerfile | 8 ++++---- docker/klipperscreen/Dockerfile | 4 ++-- docker/moonraker/Dockerfile | 4 ++-- docker/ustreamer/Dockerfile | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/klipper/Dockerfile b/docker/klipper/Dockerfile index c52eb58..0600a7d 100644 --- a/docker/klipper/Dockerfile +++ b/docker/klipper/Dockerfile @@ -1,6 +1,6 @@ ## Get Klipper Source and Build venv ## -FROM python:3.12-bookworm AS build +FROM python:3.12-trixie AS build RUN apt update \ && apt install -y cmake \ @@ -29,7 +29,7 @@ RUN venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \ ## Klippy Runtime Image ## -FROM python:3.12-slim-bookworm AS run +FROM python:3.12-slim-trixie AS run WORKDIR /opt RUN groupadd klipper --gid 1000 \ @@ -53,7 +53,7 @@ CMD ["-I", "printer_data/run/klipper.tty", "-a", "printer_data/run/klipper.sock" ## Image for building MCU code including other tooling ## -FROM debian:bookworm AS tools +FROM debian:trixie AS tools WORKDIR /opt ARG DEBIAN_FRONTEND=noninteractive @@ -87,7 +87,7 @@ RUN cd klipper \ ## Runtime image for the klipper_mcu binary ## -FROM debian:bookworm-slim AS hostmcu +FROM debian:trixie-slim AS hostmcu RUN apt update \ && apt install -y gpiod \ diff --git a/docker/klipperscreen/Dockerfile b/docker/klipperscreen/Dockerfile index a865081..3bcf5f7 100644 --- a/docker/klipperscreen/Dockerfile +++ b/docker/klipperscreen/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.13-bookworm AS build +FROM python:3.13-trixie AS build ARG REPO=https://github.com/KlipperScreen/KlipperScreen ARG VERSION=master @@ -19,7 +19,7 @@ RUN git clone ${REPO} klipperscreen \ RUN python -m venv venv \ && venv/bin/pip install -r klipperscreen/scripts/KlipperScreen-requirements.txt -FROM python:3.13-slim-bookworm AS run +FROM python:3.13-slim-trixie AS run RUN apt update \ && apt install -y \ diff --git a/docker/moonraker/Dockerfile b/docker/moonraker/Dockerfile index 50ba235..cf4416b 100644 --- a/docker/moonraker/Dockerfile +++ b/docker/moonraker/Dockerfile @@ -1,5 +1,5 @@ ## Get Code and Build venv -FROM python:3.12-bookworm AS build +FROM python:3.12-trixie AS build WORKDIR /opt COPY requirements-prind.txt . @@ -20,7 +20,7 @@ RUN python -m venv venv \ && venv/bin/pip install -r moonraker/scripts/moonraker-requirements.txt ## Runtime Image -FROM python:3.12-slim-bookworm AS run +FROM python:3.12-slim-trixie AS run RUN apt update \ && apt install -y \ diff --git a/docker/ustreamer/Dockerfile b/docker/ustreamer/Dockerfile index 0dc1676..f524c67 100644 --- a/docker/ustreamer/Dockerfile +++ b/docker/ustreamer/Dockerfile @@ -1,5 +1,5 @@ ## Get Code and make -FROM debian:bookworm-slim AS build +FROM debian:trixie-slim AS build ARG REPO=https://github.com/pikvm/ustreamer ARG VERSION=master @@ -28,7 +28,7 @@ RUN cd ustreamer \ && make LDFLAGS=-latomic ## Runtime Image -FROM debian:bookworm-slim AS run +FROM debian:trixie-slim AS run RUN apt update \ && apt install -y \ From a24f7e45930d7f63aa39da337c39cc78d0298414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20K=C3=BCffner?= Date: Fri, 19 Sep 2025 09:26:42 +0200 Subject: [PATCH 2/4] fix ustreamer build --- docker/ustreamer/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/ustreamer/Dockerfile b/docker/ustreamer/Dockerfile index f524c67..5006c7d 100644 --- a/docker/ustreamer/Dockerfile +++ b/docker/ustreamer/Dockerfile @@ -33,11 +33,11 @@ FROM debian:trixie-slim AS run RUN apt update \ && apt install -y \ ca-certificates \ - libevent-2.1-7 \ - libevent-pthreads-2.1-7 \ + libevent-2.1-7t64 \ + libevent-pthreads-2.1-7t64 \ libjpeg62-turbo \ libbsd0 \ - libgpiod2 \ + libgpiod3 \ v4l-utils \ curl \ jq \ From 87c080e9acb6e89511df018f3cb737e2c0d21d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20K=C3=BCffner?= Date: Fri, 19 Sep 2025 09:28:40 +0200 Subject: [PATCH 3/4] klipperscreen: replace libglib --- docker/klipperscreen/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/klipperscreen/Dockerfile b/docker/klipperscreen/Dockerfile index 3bcf5f7..932604e 100644 --- a/docker/klipperscreen/Dockerfile +++ b/docker/klipperscreen/Dockerfile @@ -26,7 +26,7 @@ RUN apt update \ git \ xdotool \ x11-xserver-utils \ - libglib2.0-0 \ + libglib2.0-0t64 \ libgirepository-1.0-1 \ gir1.2-gtk-3.0 \ libopenjp2-7 \ From 55ee75bf7b21c2b51d0a62faf41bdaedd760d072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20K=C3=BCffner?= Date: Fri, 19 Sep 2025 18:09:54 +0200 Subject: [PATCH 4/4] moonraker: replace libcurl and libssl --- docker/moonraker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/moonraker/Dockerfile b/docker/moonraker/Dockerfile index cf4416b..c1570a1 100644 --- a/docker/moonraker/Dockerfile +++ b/docker/moonraker/Dockerfile @@ -27,8 +27,8 @@ RUN apt update \ libopenjp2-7 \ python3-libgpiod \ curl \ - libcurl4 \ - libssl3 \ + libcurl4t64 \ + libssl3t64 \ liblmdb0 \ libsodium23 \ libjpeg62-turbo \