From f651e951fbaf3f7e9a649ed79f78572593b6c073 Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Thu, 27 Aug 2026 12:15:21 +0200 Subject: [PATCH] bump Docker RPI images to Debian Trixie (#6143) --- docker/ffmpeg-rpi.Dockerfile | 27 +++++++++++++++++++-------- docker/rpi.Dockerfile | 27 +++++++++++++++++++-------- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/docker/ffmpeg-rpi.Dockerfile b/docker/ffmpeg-rpi.Dockerfile index 3cc3f859..cfa64444 100644 --- a/docker/ffmpeg-rpi.Dockerfile +++ b/docker/ffmpeg-rpi.Dockerfile @@ -6,17 +6,25 @@ ADD binaries/mediamtx_*_linux_armv7.tar.gz /linux/arm/v7 ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64 ################################################################# -FROM --platform=linux/arm/v7 debian:bookworm-slim AS base-arm-v7 +FROM --platform=linux/arm/v7 debian:trixie-slim AS base-arm-v7 # even though the base image is armv7, # Raspbian libraries and compilers provide armv6 compatibility. RUN apt update \ && apt install -y wget gpg \ - && echo "deb http://archive.raspbian.org/raspbian bookworm main rpi firmware" > /etc/apt/sources.list \ - && echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \ - && wget -O- https://archive.raspbian.org/raspbian.public.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspbian.gpg \ - && wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \ + && wget -O /raspbian-archive-keyring.deb \ + https://archive.raspbian.org/raspbian/pool/main/r/raspbian-archive-keyring/raspbian-archive-keyring_20120528.4_all.deb \ + && dpkg -i /raspbian-archive-keyring.deb \ + && rm /raspbian-archive-keyring.deb \ + && wget -O /etc/apt/sources.list.d/raspbian.sources \ + https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspbian.sources \ + && sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspbian.sources \ + && wget -O /usr/share/keyrings/raspberrypi-archive-keyring.pgp \ + https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspberrypi-archive-keyring.pgp \ + && wget -O /etc/apt/sources.list.d/raspi.sources \ + https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspi.sources \ + && sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspi.sources \ && rm -rf /var/lib/apt/lists/* RUN apt update && apt install --reinstall -y \ @@ -26,12 +34,15 @@ RUN apt update && apt install --reinstall -y \ && rm -rf /var/lib/apt/lists/* ################################################################# -FROM --platform=linux/arm64 debian:bookworm-slim AS base-arm64 +FROM --platform=linux/arm64 debian:trixie-slim AS base-arm64 RUN apt update \ && apt install -y wget gpg \ - && echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \ - && wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \ + && wget -O /usr/share/keyrings/raspberrypi-archive-keyring.pgp \ + https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspberrypi-archive-keyring.pgp \ + && wget -O /etc/apt/sources.list.d/raspi.sources \ + https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspi.sources \ + && sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspi.sources \ && rm -rf /var/lib/apt/lists/* ################################################################# diff --git a/docker/rpi.Dockerfile b/docker/rpi.Dockerfile index ab381f3e..a31e259f 100644 --- a/docker/rpi.Dockerfile +++ b/docker/rpi.Dockerfile @@ -6,17 +6,25 @@ ADD binaries/mediamtx_*_linux_armv7.tar.gz /linux/arm/v7 ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64 ################################################################# -FROM --platform=linux/arm/v7 debian:bookworm-slim AS base-arm-v7 +FROM --platform=linux/arm/v7 debian:trixie-slim AS base-arm-v7 # even though the base image is armv7, # Raspbian libraries and compilers provide armv6 compatibility. RUN apt update \ && apt install -y wget gpg \ - && echo "deb http://archive.raspbian.org/raspbian bookworm main rpi firmware" > /etc/apt/sources.list \ - && echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \ - && wget -O- https://archive.raspbian.org/raspbian.public.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspbian.gpg \ - && wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \ + && wget -O /raspbian-archive-keyring.deb \ + https://archive.raspbian.org/raspbian/pool/main/r/raspbian-archive-keyring/raspbian-archive-keyring_20120528.4_all.deb \ + && dpkg -i /raspbian-archive-keyring.deb \ + && rm /raspbian-archive-keyring.deb \ + && wget -O /etc/apt/sources.list.d/raspbian.sources \ + https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspbian.sources \ + && sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspbian.sources \ + && wget -O /usr/share/keyrings/raspberrypi-archive-keyring.pgp \ + https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspberrypi-archive-keyring.pgp \ + && wget -O /etc/apt/sources.list.d/raspi.sources \ + https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspi.sources \ + && sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspi.sources \ && rm -rf /var/lib/apt/lists/* RUN apt update && apt install --reinstall -y \ @@ -26,12 +34,15 @@ RUN apt update && apt install --reinstall -y \ && rm -rf /var/lib/apt/lists/* ################################################################# -FROM --platform=linux/arm64 debian:bookworm-slim AS base-arm64 +FROM --platform=linux/arm64 debian:trixie-slim AS base-arm64 RUN apt update \ && apt install -y wget gpg \ - && echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \ - && wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \ + && wget -O /usr/share/keyrings/raspberrypi-archive-keyring.pgp \ + https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspberrypi-archive-keyring.pgp \ + && wget -O /etc/apt/sources.list.d/raspi.sources \ + https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspi.sources \ + && sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspi.sources \ && rm -rf /var/lib/apt/lists/* #################################################################