dw/FFmpeg-Builds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use BuildKit features to reduce amount of layers

Browse source
This commit is contained in:
BtbN 2021-04-05 19:22:03 +02:00
parent e20a907e31
commit e38500bb7d
58 changed files with 8 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

4
images/base/run_stage.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
set -xe
mkdir -p /stage
source "$1"
cd /stage
source /stage.sh
ffbuild_dockerbuild
rm -rf /stage /stage.sh "$FFBUILD_PREFIX"/bin
rm -rf /stage "$FFBUILD_PREFIX"/bin

5
scripts.d/10-mingw.sh
View file

@ -8,11 +8,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$MINGW_REPO" "$MINGW_COMMIT" mingw
cd mingw/mingw-w64-headers

5
scripts.d/20-libiconv.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir iconv
cd iconv

5
scripts.d/20-zlib.sh
View file

@ -6,11 +6,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir zlib
cd zlib

5
scripts.d/21-libxml2.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$LIBXML2_REPO" "$LIBXML2_COMMIT" libxml2
cd libxml2

5
scripts.d/25-freetype.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir ft
cd ft

5
scripts.d/25-fribidi.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$FRIBIDI_REPO" "$FRIBIDI_COMMIT" fribidi
cd fribidi

5
scripts.d/25-gmp.sh
View file

@ -6,11 +6,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir gmp
cd gmp

5
scripts.d/25-libogg.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$OGG_REPO" "$OGG_COMMIT" ogg
cd ogg

5
scripts.d/25-openssl.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$OPENSSL_REPO" "$OPENSSL_COMMIT" openssl
cd openssl

5
scripts.d/25-xz.sh
View file

@ -6,11 +6,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir xz
cd xz

5
scripts.d/35-fontconfig.sh
View file

@ -6,11 +6,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir fc
cd fc

5
scripts.d/40-fftw3.sh
View file

@ -10,11 +10,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir fftw3
cd fftw3

5
scripts.d/45-harfbuzz.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$HARFBUZZ_REPO" "$HARFBUZZ_COMMIT" harfbuzz
cd harfbuzz

5
scripts.d/45-libsamplerate.sh
View file

@ -9,11 +9,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$LIBSR_REPO" "$LIBSR_COMMIT" libsr
cd libsr

5
scripts.d/45-libudfread.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$LIBUDFREAD_REPO" "$LIBUDFREAD_COMMIT" libudfread
cd libudfread

5
scripts.d/45-lv2.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$LV2_REPO" "$LV2_COMMIT" lv2
cd lv2

5
scripts.d/45-opencl.sh
View file

@ -10,11 +10,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir opencl && cd opencl

5
scripts.d/45-serd.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$SERD_REPO" "$SERD_COMMIT" serd
cd serd

5
scripts.d/45-vmaf.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$VMAF_REPO" "$VMAF_COMMIT" vmaf
cd vmaf

6
scripts.d/45-vulkan.sh
View file

@ -8,16 +8,14 @@ ffbuild_enabled() {
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "ADD patches/vulkan /stage/patches"
to_df "RUN run_stage"
to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/vulkan,dst=/patches run_stage /stage.sh"
}
ffbuild_dockerbuild() {
git clone "$LOADER_REPO" loader
git -C loader checkout "$LOADER_COMMIT"
for patch in patches/*.patch; do
for patch in /patches/*.patch; do
echo "Applying $patch"
git -C loader am -3 < "$patch"
done

5
scripts.d/46-sord.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$SORD_REPO" "$SORD_COMMIT" sord
cd sord

5
scripts.d/47-sratom.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$SRATOM_REPO" "$SRATOM_COMMIT" sratom
cd sratom

5
scripts.d/49-libvorbis.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$VORBIS_REPO" "$VORBIS_COMMIT" vorbis
cd vorbis

5
scripts.d/50-amf.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$AMF_REPO" "$AMF_COMMIT" amf
cd amf

5
scripts.d/50-aom.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$AOM_REPO" "$AOM_COMMIT" aom
cd aom

5
scripts.d/50-avisynth.sh
View file

@ -8,11 +8,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$AVISYNTH_REPO" "$AVISYNTH_COMMIT" avisynth
cd avisynth

5
scripts.d/50-dav1d.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$DAV1D_REPO" "$DAV1D_COMMIT" dav1d
cd dav1d

5
scripts.d/50-davs2.sh
View file

@ -9,11 +9,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git clone "$DAVS2_REPO" davs2
cd davs2

5
scripts.d/50-ffnvcodec.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$FFNVCODEC_REPO" "$FFNVCODEC_COMMIT" ffnvcodec
cd ffnvcodec

5
scripts.d/50-glslang.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$GLSLANG_REPO" "$GLSLANG_COMMIT" glslang
cd glslang

5
scripts.d/50-gme.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git clone "$GME_REPO" gme
cd gme

5
scripts.d/50-libass.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$ASS_REPO" "$ASS_COMMIT" ass
cd ass

5
scripts.d/50-libbluray.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$LIBBLURAY_REPO" "$LIBBLURAY_COMMIT" libbluray
cd libbluray

5
scripts.d/50-libmp3lame.sh
View file

@ -6,11 +6,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir lame
cd lame

5
scripts.d/50-libopus.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$OPUS_REPO" "$OPUS_COMMIT" opus
cd opus

5
scripts.d/50-libtheora.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$THEORA_REPO" "$THEORA_COMMIT" theora
cd theora

5
scripts.d/50-libvpx.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$LIBVPX_REPO" "$LIBVPX_COMMIT" libvpx
cd libvpx

5
scripts.d/50-libwebp.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$WEBP_REPO" "$WEBP_COMMIT" webp
cd webp

5
scripts.d/50-lilv.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$LILV_REPO" "$LILV_COMMIT" lilv
cd lilv

5
scripts.d/50-mfx.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$MFX_REPO" "$MFX_COMMIT" mfx
cd mfx

5
scripts.d/50-opencore-amr.sh
View file

@ -6,11 +6,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir opencore
cd opencore

5
scripts.d/50-openjpeg.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$OPENJPEG_REPO" "$OPENJPEG_COMMIT" openjpeg
cd openjpeg

5
scripts.d/50-rav1e.sh
View file

@ -8,11 +8,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$RAV1E_REPO" "$RAV1E_COMMIT" rav1e
cd rav1e

5
scripts.d/50-rubberband.sh
View file

@ -8,11 +8,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir rubberband
cd rubberband

5
scripts.d/50-sdl.sh
View file

@ -6,11 +6,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir sdl
cd sdl

5
scripts.d/50-soxr.sh
View file

@ -8,11 +8,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$SOXR_REPO" "$SOXR_COMMIT" soxr
cd soxr

5
scripts.d/50-srt.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$SRT_REPO" "$SRT_COMMIT" srt
cd srt

5
scripts.d/50-svtav1.sh
View file

@ -9,11 +9,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git clone "$SVTAV1_REPO" svtav1
cd svtav1

5
scripts.d/50-twolame.sh
View file

@ -6,11 +6,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir twolame
cd twolame

5
scripts.d/50-uavs3d.sh
View file

@ -9,11 +9,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git clone "$UAVS3D_REPO" uavs3d
cd uavs3d

5
scripts.d/50-vidstab.sh
View file

@ -9,11 +9,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$VIDSTAB_REPO" "$VIDSTAB_COMMIT" vidstab
cd vidstab

5
scripts.d/50-x264.sh
View file

@ -8,11 +8,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$X264_REPO" "$X264_COMMIT" x264
cd x264

5
scripts.d/50-x265.sh
View file

@ -8,11 +8,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git clone "$X265_REPO" x265
cd x265

5
scripts.d/50-xavs2.sh
View file

@ -9,11 +9,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git clone "$XAVS2_REPO" xavs2
cd xavs2

5
scripts.d/50-xvid.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
mkdir xvid
cd xvid

5
scripts.d/50-zimg.sh
View file

@ -7,11 +7,6 @@ ffbuild_enabled() {
return 0
}
ffbuild_dockerstage() {
to_df "ADD $SELF /stage.sh"
to_df "RUN run_stage"
}
ffbuild_dockerbuild() {
git-mini-clone "$ZIMG_REPO" "$ZIMG_COMMIT" zimg
cd zimg

4
util/vars.sh
View file

@ -35,6 +35,10 @@ BASE_IMAGE="${REGISTRY}/${REPO}/base:latest"
TARGET_IMAGE="${REGISTRY}/${REPO}/base-${TARGET}:latest"
IMAGE="${REGISTRY}/${REPO}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}:latest"
ffbuild_dockerstage() {
to_df "RUN --mount=src=${SELF},dst=/stage.sh run_stage /stage.sh"
}
ffbuild_configure() {
return 0
}