av: move ffmpeg to common build

bjia56 · May 31, 2024 · fb3c0a8 · fb3c0a8
1 parent 946e27f
commit fb3c0a8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/packages/av/Dockerfile.stage1 b/packages/av/Dockerfile.stage1
@@ -19,9 +19,6 @@ ENV FFMPEG_BUILD_CMD_PREFIX="python3.8 scripts/build-ffmpeg.py /tmp/vendor --sta
 
 
 FROM ver-${VERSION}
-ARG PYTHON_VERSION
-ARG VERSION
-ARG OUTPUT_DIR
 
 ENV CC=/opt/rh/devtoolset-10/root/usr/bin/gcc
 ENV FC=/opt/rh/devtoolset-10/root/usr/bin/gfortran5

diff --git a/packages/av/Dockerfile.stage2 b/packages/av/Dockerfile.stage2
@@ -1,7 +1,4 @@
 FROM base
-ARG PYTHON_VERSION
-ARG VERSION
-ARG OUTPUT_DIR
 
 WORKDIR pyav-ffmpeg
 RUN ${FFMPEG_BUILD_CMD_PREFIX} 2

diff --git a/packages/av/Dockerfile.stage3 b/packages/av/Dockerfile.stage3
@@ -1,7 +1,4 @@
 FROM base
-ARG PYTHON_VERSION
-ARG VERSION
-ARG OUTPUT_DIR
 
 WORKDIR pyav-ffmpeg
 RUN ${FFMPEG_BUILD_CMD_PREFIX} 3

diff --git a/packages/av/build.yaml b/packages/av/build.yaml
@@ -1,8 +1,11 @@
 strategy: dockerfile
 source:
-- ./Dockerfile.stage1
-- ./Dockerfile.stage2
-- ./Dockerfile.stage3
+- file: ./Dockerfile.stage1
+  common: true
+- file: ./Dockerfile.stage2
+  common: true
+- file: ./Dockerfile.stage3
+  common: true
 - ./Dockerfile.stage4
 
 python: