From 54bb3da486751294db8cf21a85442d29574d6f9c Mon Sep 17 00:00:00 2001 From: SergeantPanda Date: Thu, 8 May 2025 11:25:28 -0500 Subject: [PATCH 1/2] Added missing libraries for ffmpeg. --- docker/DispatcharrBase | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/DispatcharrBase b/docker/DispatcharrBase index a6bbec476..33d251e92 100644 --- a/docker/DispatcharrBase +++ b/docker/DispatcharrBase @@ -10,13 +10,15 @@ RUN apt-get update && apt-get install -y \ && add-apt-repository -y ppa:deadsnakes/ppa -RUN apt-get update && apt install -y \ +RUN apt-get install -y \ curl wget gnupg2 ca-certificates lsb-release build-essential \ gcc libpcre3 libpcre3-dev libpq-dev procps streamlink \ libva-drm2 libva-x11-2 libva-dev libva-wayland2 \ i965-va-driver intel-media-va-driver mesa-va-drivers \ python3.13 python3.13-dev python3.13-venv python3-pip \ - nginx \ + libstdc++6 libglib2.0-0 libgomp1 libvdpau1 libva2 \ + libxcb-shape0 libv4l-0 ocl-icd-libopencl1 \ + alsa-base libasound2t64 nginx \ && apt-get clean && rm -rf /var/lib/apt/lists/* # --- Create Python virtual environment --- From daf06853558061d23fd7d0f19a85a9e67dc55e41 Mon Sep 17 00:00:00 2001 From: SergeantPanda Date: Thu, 8 May 2025 12:36:19 -0500 Subject: [PATCH 2/2] Switch to ffmpeg as base. --- docker/DispatcharrBase | 8 ++------ docker/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/docker/DispatcharrBase b/docker/DispatcharrBase index 33d251e92..0cfaf44e2 100644 --- a/docker/DispatcharrBase +++ b/docker/DispatcharrBase @@ -1,4 +1,5 @@ -FROM ubuntu:24.04 +# --- Stage 1: Get FFmpeg from lscr.io --- +FROM lscr.io/linuxserver/ffmpeg:latest AS ffmpeg ENV DEBIAN_FRONTEND=noninteractive ENV VIRTUAL_ENV=/dispatcharrpy @@ -28,11 +29,6 @@ RUN python3.13 -m venv $VIRTUAL_ENV && $VIRTUAL_ENV/bin/pip install --upgrade pi COPY requirements.txt /tmp/requirements.txt RUN $VIRTUAL_ENV/bin/pip install --no-cache-dir -r /tmp/requirements.txt && rm /tmp/requirements.txt -# --- Add FFmpeg binaries from lscr.io/linuxserver/ffmpeg --- -COPY --from=lscr.io/linuxserver/ffmpeg:latest /usr/local/bin/ffmpeg /usr/local/bin/ -COPY --from=lscr.io/linuxserver/ffmpeg:latest /usr/local/bin/ffprobe /usr/local/bin/ -COPY --from=lscr.io/linuxserver/ffmpeg:latest /usr/local/lib/ /usr/local/lib/ - # --- Set up Redis 7.x --- RUN curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg && \ echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | \ diff --git a/docker/Dockerfile b/docker/Dockerfile index 16162de77..bdb4b8931 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -35,4 +35,4 @@ RUN if [ -n "$TIMESTAMP" ]; then \ cat /app/version.py; \ fi -CMD ["/app/docker/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/app/docker/entrypoint.sh"] \ No newline at end of file