From 70313bce69e4a9ef4dcb06686e4b8a082fec2b6e Mon Sep 17 00:00:00 2001 From: SergeantPanda Date: Thu, 8 May 2025 16:41:14 -0500 Subject: [PATCH] Cleaned up unnecessary layer. --- docker/DispatcharrBase | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/docker/DispatcharrBase b/docker/DispatcharrBase index 0cfaf44e..58741715 100644 --- a/docker/DispatcharrBase +++ b/docker/DispatcharrBase @@ -1,25 +1,21 @@ -# --- Stage 1: Get FFmpeg from lscr.io --- -FROM lscr.io/linuxserver/ffmpeg:latest AS ffmpeg +FROM lscr.io/linuxserver/ffmpeg:latest ENV DEBIAN_FRONTEND=noninteractive ENV VIRTUAL_ENV=/dispatcharrpy ENV PATH="$VIRTUAL_ENV/bin:$PATH" -# --- Install system-level base dependencies --- -RUN apt-get update && apt-get install -y \ - software-properties-common \ - && add-apt-repository -y ppa:deadsnakes/ppa - - -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 \ - libstdc++6 libglib2.0-0 libgomp1 libvdpau1 libva2 \ - libxcb-shape0 libv4l-0 ocl-icd-libopencl1 \ - alsa-base libasound2t64 nginx \ +# --- Install Python 3.13 and system dependencies --- +# Note: Hardware acceleration (VA-API, VDPAU, NVENC) already included in base ffmpeg image +RUN apt-get update && apt-get install --no-install-recommends -y \ + ca-certificates software-properties-common gnupg2 curl wget \ + && add-apt-repository ppa:deadsnakes/ppa \ + && apt-get update \ + && apt-get install --no-install-recommends -y \ + python3.13 python3.13-dev python3.13-venv \ + python-is-python3 python3-pip \ + libpcre3 libpcre3-dev libpq-dev procps \ + build-essential gcc \ + nginx streamlink \ && apt-get clean && rm -rf /var/lib/apt/lists/* # --- Create Python virtual environment ---