Use BuildKit features to reduce amount of layers

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -35,6 +35,10 @@ BASE_IMAGE="${REGISTRY}/${REPO}/base:latest"
TARGET_IMAGE="${REGISTRY}/${REPO}/base-${TARGET}:latest" TARGET_IMAGE="${REGISTRY}/${REPO}/base-${TARGET}:latest"
IMAGE="${REGISTRY}/${REPO}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}: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() { ffbuild_configure() {
return 0 return 0
} }