Merge pull request #226 from mkuf/renovate/debian-13.x

chore(deps): update debian docker tag to v13
This commit is contained in:
Markus Küffner
2025-09-19 20:14:27 +02:00
committed by GitHub
4 changed files with 16 additions and 16 deletions

View File

@@ -1,6 +1,6 @@
## Get Klipper Source and Build venv ## Get Klipper Source and Build venv
## ##
FROM python:3.12-bookworm AS build FROM python:3.12-trixie AS build
RUN apt update \ RUN apt update \
&& apt install -y cmake \ && apt install -y cmake \
@@ -29,7 +29,7 @@ RUN venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \
## Klippy Runtime Image ## Klippy Runtime Image
## ##
FROM python:3.12-slim-bookworm AS run FROM python:3.12-slim-trixie AS run
WORKDIR /opt WORKDIR /opt
RUN groupadd klipper --gid 1000 \ 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 ## Image for building MCU code including other tooling
## ##
FROM debian:bookworm AS tools FROM debian:trixie AS tools
WORKDIR /opt WORKDIR /opt
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@@ -87,7 +87,7 @@ RUN cd klipper \
## Runtime image for the klipper_mcu binary ## Runtime image for the klipper_mcu binary
## ##
FROM debian:bookworm-slim AS hostmcu FROM debian:trixie-slim AS hostmcu
RUN apt update \ RUN apt update \
&& apt install -y gpiod \ && apt install -y gpiod \

View File

@@ -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 REPO=https://github.com/KlipperScreen/KlipperScreen
ARG VERSION=master ARG VERSION=master
@@ -19,14 +19,14 @@ RUN git clone ${REPO} klipperscreen \
RUN python -m venv venv \ RUN python -m venv venv \
&& venv/bin/pip install -r klipperscreen/scripts/KlipperScreen-requirements.txt && 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 \ RUN apt update \
&& apt install -y \ && apt install -y \
git \ git \
xdotool \ xdotool \
x11-xserver-utils \ x11-xserver-utils \
libglib2.0-0 \ libglib2.0-0t64 \
libgirepository-1.0-1 \ libgirepository-1.0-1 \
gir1.2-gtk-3.0 \ gir1.2-gtk-3.0 \
libopenjp2-7 \ libopenjp2-7 \

View File

@@ -1,5 +1,5 @@
## Get Code and Build venv ## Get Code and Build venv
FROM python:3.12-bookworm AS build FROM python:3.12-trixie AS build
WORKDIR /opt WORKDIR /opt
COPY requirements-prind.txt . COPY requirements-prind.txt .
@@ -20,15 +20,15 @@ RUN python -m venv venv \
&& venv/bin/pip install -r moonraker/scripts/moonraker-requirements.txt && venv/bin/pip install -r moonraker/scripts/moonraker-requirements.txt
## Runtime Image ## Runtime Image
FROM python:3.12-slim-bookworm AS run FROM python:3.12-slim-trixie AS run
RUN apt update \ RUN apt update \
&& apt install -y \ && apt install -y \
libopenjp2-7 \ libopenjp2-7 \
python3-libgpiod \ python3-libgpiod \
curl \ curl \
libcurl4 \ libcurl4t64 \
libssl3 \ libssl3t64 \
liblmdb0 \ liblmdb0 \
libsodium23 \ libsodium23 \
libjpeg62-turbo \ libjpeg62-turbo \

View File

@@ -1,5 +1,5 @@
## Get Code and make ## Get Code and make
FROM debian:bookworm-slim AS build FROM debian:trixie-slim AS build
ARG REPO=https://github.com/pikvm/ustreamer ARG REPO=https://github.com/pikvm/ustreamer
ARG VERSION=master ARG VERSION=master
@@ -28,16 +28,16 @@ RUN cd ustreamer \
&& make LDFLAGS=-latomic && make LDFLAGS=-latomic
## Runtime Image ## Runtime Image
FROM debian:bookworm-slim AS run FROM debian:trixie-slim AS run
RUN apt update \ RUN apt update \
&& apt install -y \ && apt install -y \
ca-certificates \ ca-certificates \
libevent-2.1-7 \ libevent-2.1-7t64 \
libevent-pthreads-2.1-7 \ libevent-pthreads-2.1-7t64 \
libjpeg62-turbo \ libjpeg62-turbo \
libbsd0 \ libbsd0 \
libgpiod2 \ libgpiod3 \
v4l-utils \ v4l-utils \
curl \ curl \
jq \ jq \