OPC/mediamtx
2
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

bump Docker RPI images to Debian Trixie (#6143)

Browse Source
This commit is contained in:
Alessandro Ros
2026-08-27 10:15:21 +00:00
committed by GitHub
parent 17f4328eaf
commit f651e951fb
2 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/ffmpeg-rpi.Dockerfile
+19 -8
View File
@@ -6,17 +6,25 @@ ADD binaries/mediamtx_*_linux_armv7.tar.gz /linux/arm/v7
ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64 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, # even though the base image is armv7,
# Raspbian libraries and compilers provide armv6 compatibility. # Raspbian libraries and compilers provide armv6 compatibility.
RUN apt update \ RUN apt update \
&& apt install -y wget gpg \ && apt install -y wget gpg \
&& echo "deb http://archive.raspbian.org/raspbian bookworm main rpi firmware" > /etc/apt/sources.list \ && wget -O /raspbian-archive-keyring.deb \
&& echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \ https://archive.raspbian.org/raspbian/pool/main/r/raspbian-archive-keyring/raspbian-archive-keyring_20120528.4_all.deb \
&& wget -O- https://archive.raspbian.org/raspbian.public.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspbian.gpg \ && dpkg -i /raspbian-archive-keyring.deb \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \ && 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/* && rm -rf /var/lib/apt/lists/*
RUN apt update && apt install --reinstall -y \ RUN apt update && apt install --reinstall -y \
@@ -26,12 +34,15 @@ RUN apt update && apt install --reinstall -y \
&& rm -rf /var/lib/apt/lists/* && 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 \ RUN apt update \
&& apt install -y wget gpg \ && apt install -y wget gpg \
&& echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \ && wget -O /usr/share/keyrings/raspberrypi-archive-keyring.pgp \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \ 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/* && rm -rf /var/lib/apt/lists/*
################################################################# #################################################################
docker/rpi.Dockerfile
+19 -8
View File
@@ -6,17 +6,25 @@ ADD binaries/mediamtx_*_linux_armv7.tar.gz /linux/arm/v7
ADD binaries/mediamtx_*_linux_arm64.tar.gz /linux/arm64 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, # even though the base image is armv7,
# Raspbian libraries and compilers provide armv6 compatibility. # Raspbian libraries and compilers provide armv6 compatibility.
RUN apt update \ RUN apt update \
&& apt install -y wget gpg \ && apt install -y wget gpg \
&& echo "deb http://archive.raspbian.org/raspbian bookworm main rpi firmware" > /etc/apt/sources.list \ && wget -O /raspbian-archive-keyring.deb \
&& echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \ https://archive.raspbian.org/raspbian/pool/main/r/raspbian-archive-keyring/raspbian-archive-keyring_20120528.4_all.deb \
&& wget -O- https://archive.raspbian.org/raspbian.public.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspbian.gpg \ && dpkg -i /raspbian-archive-keyring.deb \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \ && 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/* && rm -rf /var/lib/apt/lists/*
RUN apt update && apt install --reinstall -y \ RUN apt update && apt install --reinstall -y \
@@ -26,12 +34,15 @@ RUN apt update && apt install --reinstall -y \
&& rm -rf /var/lib/apt/lists/* && 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 \ RUN apt update \
&& apt install -y wget gpg \ && apt install -y wget gpg \
&& echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \ && wget -O /usr/share/keyrings/raspberrypi-archive-keyring.pgp \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \ 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/* && rm -rf /var/lib/apt/lists/*
################################################################# #################################################################