Use newer FFmpeg from Debian Multimedia repo in Docker images

Author: elonen

Dockerfile.demo

@@ -4,9 +4,16 @@ FROM debian:bookworm-slim AS base
 
 # Install system packages
 RUN apt-get -qy update
-
-RUN apt-get -qy install acl sudo logrotate python3.11 >/dev/null
-RUN apt-get -qy install sqlite3 ffmpeg mediainfo nginx >/dev/null
+RUN apt-get -qy install acl sudo logrotate python3 python3.11 >/dev/null
+RUN apt-get -qy install nginx >/dev/null
+
+# Add deb-multimedia repository (for a more recent ffmpeg)
+RUN apt-get -qy install gnupg2 wget
+RUN wget -q https://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multimedia-keyring_2016.8.1_all.deb
+RUN dpkg -i deb-multimedia-keyring_2016.8.1_all.deb
+RUN echo "deb https://www.deb-multimedia.org bookworm main non-free" > /etc/apt/sources.list.d/deb-multimedia.list
+RUN apt-get -qy update
+RUN apt-get -qy install sqlite3 ffmpeg mediainfo >/dev/null
 
 # Add regular user (to match local user ID)
 ARG UID=1000

Dockerfile.org-python

@@ -7,7 +7,8 @@ RUN set -eux; \
         debhelper \
         dh-virtualenv \
 	dh-python \
-        python3 \
+	python3 \
+        python3.11 \
         python3-dev \
         python3-pip \
         python3-setuptools \

Dockerfile.server

@@ -20,6 +20,14 @@ USER ${UID}:${GID}
 RUN cargo install cargo-deb
 USER root
 
+# Add deb-multimedia repository (for a more recent ffmpeg)
+RUN apt-get -qy update
+RUN apt-get -qy install gnupg2 wget
+RUN wget -q https://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multimedia-keyring_2016.8.1_all.deb
+RUN dpkg -i deb-multimedia-keyring_2016.8.1_all.deb
+RUN echo "deb https://www.deb-multimedia.org bookworm main non-free" > /etc/apt/sources.list.d/deb-multimedia.list
+RUN apt-get -qy update
+
 # Install system packages
 RUN apt-get -qy update
 RUN apt-get -qy install acl sudo logrotate >/dev/null
@@ -36,7 +44,7 @@ RUN apt-get -qy install sqlite3 >/dev/null
 RUN apt-get -qy install libssl-dev >/dev/null
 RUN apt-get -qy install libsqlite3-dev >/dev/null
 RUN apt-get -qy install protobuf-compiler >/dev/null
-RUN apt-get -qy install python3.11-venv >/dev/null
+RUN apt-get -qy install python3 python3.11 python3.11-venv >/dev/null
 
 # Switch to regular user
 RUN mkdir -p /app