Skip to content

Commit

Permalink
update for new builder cmdline
Browse files Browse the repository at this point in the history
  • Loading branch information
bjia56 authored May 30, 2024
1 parent 373a8e4 commit 31f8867
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion packages/av/Dockerfile.stage1
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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 ..
2 changes: 1 addition & 1 deletion packages/av/Dockerfile.stage2
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..
2 changes: 1 addition & 1 deletion packages/av/Dockerfile.stage3
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..

0 comments on commit 31f8867

Please sign in to comment.