Skip to content

Docker refactor #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SergeantPanda merged 2 commits into from
May 8, 2025
Merged

Docker refactor #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54bb3da
Added missing libraries for ffmpeg.
SergeantPanda May 8, 2025
daf0685
Switch to ffmpeg as base.
SergeantPanda May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions docker/DispatcharrBase
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -10,13 +11,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 ---
Expand All @@ -26,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" | \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ RUN if [ -n "$TIMESTAMP" ]; then \
cat /app/version.py; \
fi

CMD ["/app/docker/entrypoint.sh"]
ENTRYPOINT ["/app/docker/entrypoint.sh"]