From 31f88674ef929c4c6d1bea289a3525405695071c Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Thu, 30 May 2024 08:51:30 -0400 Subject: [PATCH] update for new builder cmdline --- packages/av/Dockerfile.stage1 | 5 ++++- packages/av/Dockerfile.stage2 | 2 +- packages/av/Dockerfile.stage3 | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/av/Dockerfile.stage1 b/packages/av/Dockerfile.stage1 index 5d75452..d5d88c8 100644 --- a/packages/av/Dockerfile.stage1 +++ b/packages/av/Dockerfile.stage1 @@ -3,12 +3,15 @@ ARG VERSION FROM base AS ver-9.2.0 ENV FFMPEG_BUILD_VER=4.4.1-7 +ENV FFMPEG_BUILD_CMD_PREFIX="python3.8 scripts/build-ffmpeg.py /tmp/vendor" FROM base AS ver-11.0.0 ENV FFMPEG_BUILD_VER=6.0.0-1 +ENV FFMPEG_BUILD_CMD_PREFIX="python3.8 scripts/build-ffmpeg.py /tmp/vendor" FROM base AS ver-12.0.0 ENV FFMPEG_BUILD_VER=6.1.1-1 +ENV FFMPEG_BUILD_CMD_PREFIX="python3.8 scripts/build-ffmpeg.py /tmp/vendor --stage" FROM ver-${VERSION} @@ -29,5 +32,5 @@ ENV CIBUILDWHEEL=1 COPY *.patch . WORKDIR pyav-ffmpeg RUN git apply ../${VERSION}.patch; exit 0 -RUN python3.8 scripts/build-ffmpeg.py /tmp/vendor 1 +RUN ${FFMPEG_BUILD_CMD_PREFIX} 1 WORKDIR .. diff --git a/packages/av/Dockerfile.stage2 b/packages/av/Dockerfile.stage2 index 8e1bc48..4628329 100644 --- a/packages/av/Dockerfile.stage2 +++ b/packages/av/Dockerfile.stage2 @@ -4,5 +4,5 @@ ARG VERSION ARG OUTPUT_DIR WORKDIR pyav-ffmpeg -RUN python3.8 scripts/build-ffmpeg.py /tmp/vendor 2 +RUN ${FFMPEG_BUILD_CMD_PREFIX} 2 WORKDIR .. diff --git a/packages/av/Dockerfile.stage3 b/packages/av/Dockerfile.stage3 index 27286b4..5af28f5 100644 --- a/packages/av/Dockerfile.stage3 +++ b/packages/av/Dockerfile.stage3 @@ -4,5 +4,5 @@ ARG VERSION ARG OUTPUT_DIR WORKDIR pyav-ffmpeg -RUN python3.8 scripts/build-ffmpeg.py /tmp/vendor 3 +RUN ${FFMPEG_BUILD_CMD_PREFIX} 3 WORKDIR ..