Mirrors/FFmpeg-Builds
1
0
Fork 0
mirror of https://github.com/BtbN/FFmpeg-Builds.git synced 2025-04-29 22:24:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reduce cache size further by not adding build dir to it

Browse Source
This commit is contained in:
BtbN 2024-01-26 23:55:23 +01:00
parent 7f0f51904f
commit 932ff8fb57
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
generate.sh
View File

@ -39,8 +39,7 @@ exec_dockerstage() {
STG="$(ffbuild_dockerdl)" STG="$(ffbuild_dockerdl)"
if [[ -n "$STG" ]]; then if [[ -n "$STG" ]]; then
HASH="$(sha256sum <<<"$STG" | cut -d" " -f1)" HASH="$(sha256sum <<<"$STG" | cut -d" " -f1)"
to_df "ADD .cache/downloads/${STAGENAME}_${HASH}.tar.xz /${STAGENAME}" export SELFCACHE=".cache/downloads/${STAGENAME}_${HASH}.tar.xz"
to_df "WORKDIR /${STAGENAME}"
fi fi
ffbuild_dockerstage || exit $? ffbuild_dockerstage || exit $?

2
scripts.d/50-aom.sh
View File

@ -8,7 +8,7 @@ ffbuild_enabled() {
} }
ffbuild_dockerstage() { ffbuild_dockerstage() {
to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/aom,dst=/patches run_stage /stage.sh" to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=${SELFCACHE},dst=/cache.tar.xz --mount=src=patches/aom,dst=/patches run_stage /stage.sh"
} }
ffbuild_dockerbuild() { ffbuild_dockerbuild() {

2
scripts.d/50-aribb24/50-libaribb24.sh
View File

@ -8,7 +8,7 @@ ffbuild_enabled() {
} }
ffbuild_dockerstage() { ffbuild_dockerstage() {
to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh" to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=${SELFCACHE},dst=/cache.tar.xz --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh"
} }
ffbuild_dockerbuild() { ffbuild_dockerbuild() {

2
scripts.d/50-zvbi.sh
View File

@ -8,7 +8,7 @@ ffbuild_enabled() {
} }
ffbuild_dockerstage() { ffbuild_dockerstage() {
to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/zvbi,dst=/patches run_stage /stage.sh" to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=${SELFCACHE},dst=/cache.tar.xz --mount=src=patches/zvbi,dst=/patches run_stage /stage.sh"
} }
ffbuild_dockerdl() { ffbuild_dockerdl() {

9
util/run_stage.sh
View File

@ -8,6 +8,15 @@ export RAW_LDFLAGS="$LDFLAGS"
[[ -n "$STAGE_CXXFLAGS" ]] && export CXXFLAGS="$CXXFLAGS $STAGE_CXXFLAGS" [[ -n "$STAGE_CXXFLAGS" ]] && export CXXFLAGS="$CXXFLAGS $STAGE_CXXFLAGS"
[[ -n "$STAGE_LDFLAGS" ]] && export LDFLAGS="$LDFLAGS $STAGE_LDFLAGS" [[ -n "$STAGE_LDFLAGS" ]] && export LDFLAGS="$LDFLAGS $STAGE_LDFLAGS"
if [[ -n "$STAGENAME" && -f /cache.tar.xz ]]; then
mkdir -p "/$STAGENAME"
tar xaf /cache.tar.xz -C "/$STAGENAME"
cd "/$STAGENAME"
elif [[ -n "$STAGENAME" ]]; then
mkdir -p "/$STAGENAME"
cd "/$STAGENAME"
fi
git config --global --add safe.directory "$PWD" git config --global --add safe.directory "$PWD"
source "$1" source "$1"

6
util/vars.sh
View File

@ -38,7 +38,11 @@ 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() { ffbuild_dockerstage() {
to_df "RUN --mount=src=${SELF},dst=/stage.sh run_stage /stage.sh" if [[ -n "$SELFCACHE" ]]; then
to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=${SELFCACHE},dst=/cache.tar.xz run_stage /stage.sh"
else
to_df "RUN --mount=src=${SELF},dst=/stage.sh run_stage /stage.sh"
fi
} }
ffbuild_dockerlayer() { ffbuild_dockerlayer() {