CopyBot/mediacms
1
0
Fork 0
mirror of https://github.com/mediacms-io/mediacms.git synced 2025-11-05 23:18:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat: revert ffmpeg install

Browse Source
This commit is contained in:
Markos Gogoulos 2025-07-07 13:33:45 +03:00
parent 8aa89c0958
commit de99d84c18
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Dockerfile
View File

@ -2,18 +2,17 @@ FROM python:3.13.5-bookworm AS build-image
# Install system dependencies needed for downloading and extracting # Install system dependencies needed for downloading and extracting
RUN apt-get update -y && \ RUN apt-get update -y && \
apt-get install -y --no-install-recommends wget xz-utils unzip ffmpeg && \ apt-get install -y --no-install-recommends wget xz-utils unzip && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
apt-get purge --auto-remove && \ apt-get purge --auto-remove && \
apt-get clean apt-get clean
# Install ffmpeg - using apt package instead of static binary for faster builds RUN wget -q https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz
# Original static binary download hangs in github actions:
# RUN wget -q https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \ RUN mkdir -p ffmpeg-tmp && \
# mkdir -p ffmpeg-tmp && \ tar -xf ffmpeg-release-amd64-static.tar.xz --strip-components 1 -C ffmpeg-tmp && \
# tar -xf ffmpeg-release-amd64-static.tar.xz --strip-components 1 -C ffmpeg-tmp && \ cp -v ffmpeg-tmp/ffmpeg ffmpeg-tmp/ffprobe ffmpeg-tmp/qt-faststart /usr/local/bin && \
# cp -v ffmpeg-tmp/ffmpeg ffmpeg-tmp/ffprobe ffmpeg-tmp/qt-faststart /usr/local/bin && \ rm -rf ffmpeg-tmp ffmpeg-release-amd64-static.tar.xz
# rm -rf ffmpeg-tmp ffmpeg-release-amd64-static.tar.xz
# Install Bento4 in the specified location # Install Bento4 in the specified location
RUN mkdir -p /home/mediacms.io/bento4 && \ RUN mkdir -p /home/mediacms.io/bento4 && \
@ -35,19 +34,18 @@ ENV CELERY_APP='cms'
ENV VIRTUAL_ENV=/home/mediacms.io ENV VIRTUAL_ENV=/home/mediacms.io
ENV PATH="$VIRTUAL_ENV/bin:$PATH" ENV PATH="$VIRTUAL_ENV/bin:$PATH"
# Install runtime system dependencies (including ffmpeg) # Install runtime system dependencies
RUN apt-get update -y && \ RUN apt-get update -y && \
apt-get -y upgrade && \ apt-get -y upgrade && \
apt-get install --no-install-recommends supervisor nginx imagemagick procps pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl ffmpeg -y && \ apt-get install --no-install-recommends supervisor nginx imagemagick procps pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl -y && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
apt-get purge --auto-remove && \ apt-get purge --auto-remove && \
apt-get clean apt-get clean
# Copy Bento4 from build image (ffmpeg now available system-wide via apt) # Copy ffmpeg and Bento4 from build image
# Original binary copying (no longer needed): COPY --from=build-image /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
# COPY --from=build-image /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg COPY --from=build-image /usr/local/bin/ffprobe /usr/local/bin/ffprobe
# COPY --from=build-image /usr/local/bin/ffprobe /usr/local/bin/ffprobe COPY --from=build-image /usr/local/bin/qt-faststart /usr/local/bin/qt-faststart
# COPY --from=build-image /usr/local/bin/qt-faststart /usr/local/bin/qt-faststart
COPY --from=build-image /home/mediacms.io/bento4 /home/mediacms.io/bento4 COPY --from=build-image /home/mediacms.io/bento4 /home/mediacms.io/bento4
# Set up virtualenv # Set up virtualenv
@ -71,6 +69,7 @@ COPY . /home/mediacms.io/mediacms
WORKDIR /home/mediacms.io/mediacms WORKDIR /home/mediacms.io/mediacms
# required for sprite thumbnail generation for large video files # required for sprite thumbnail generation for large video files
COPY deploy/docker/policy.xml /etc/ImageMagick-6/policy.xml COPY deploy/docker/policy.xml /etc/ImageMagick-6/policy.xml
# Set process control environment variables # Set process control environment variables