Skip to content

Commit 84842f4

Browse files
committed
chore(deps): update how ffmpeg build script runs as seems not works for latest versions.
1 parent c4618f8 commit 84842f4

File tree

1 file changed

+8
-20
lines changed

1 file changed

+8
-20
lines changed

Dockerfile

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,19 @@ FROM ${BASE_IMAGE} AS builder-ffmpeg
44
ENV DEBIAN_FRONTEND=noninteractive
55

66
RUN apt-get update \
7-
&& apt-get -y --no-install-recommends install \
8-
build-essential \
9-
curl \
10-
ca-certificates \
11-
libva-dev \
12-
python3 \
13-
python-is-python3 \
14-
ninja-build \
15-
meson \
7+
&& apt-get -y --no-install-recommends install git build-essential curl ca-certificates libva-dev \
8+
python3 python-is-python3 ninja-build meson git curl \
169
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
1710
&& update-ca-certificates
1811

1912
WORKDIR /app
2013

21-
ARG FFMPEG_BUILD_SCRIPT_VERSION=7ea5427c1f91d5eb3400f47dfe5e425844e4af35
14+
ARG FFMPEG_BUILD_SCRIPT_VERSION=v1.54
2215
# ADD doesn't cache when used from URL
23-
RUN curl -sLO \
24-
https://raw.githubusercontent.com/markus-perl/ffmpeg-build-script/${FFMPEG_BUILD_SCRIPT_VERSION}/build-ffmpeg && \
25-
chmod 755 ./build-ffmpeg && \
26-
SKIPINSTALL=yes ./build-ffmpeg \
27-
--build \
28-
--enable-gpl-and-non-free && \
29-
rm -rf packages && \
30-
find workspace -mindepth 1 -maxdepth 1 -type d ! -name 'bin' -exec rm -rf {} \; && \
31-
find workspace/bin -mindepth 1 -maxdepth 1 -type f ! -name 'ff*' -exec rm -f {} \;
16+
RUN git clone --depth 1 --branch ${FFMPEG_BUILD_SCRIPT_VERSION} https://github.com/markus-perl/ffmpeg-build-script.git && \
17+
cd ffmpeg-build-script && \
18+
SKIPINSTALL=yes ./build-ffmpeg --build --enable-gpl-and-non-free && \
19+
rm -rf packages
3220

3321
FROM debian:trixie-20241223-slim AS base
3422
RUN apt-get update \
@@ -39,7 +27,7 @@ RUN apt-get update \
3927
wget \
4028
&& rm -rf /var/lib/apt/lists/*
4129

42-
COPY --from=builder-ffmpeg /app/workspace/bin/ff* /usr/bin/
30+
COPY --from=builder-ffmpeg /app/ffmpeg-build-script/workspace/bin/ff* /usr/bin/
4331

4432
# Check shared library
4533
RUN ldd /usr/bin/ffmpeg && \

0 commit comments

Comments
 (0)