Mirrors/FFmpeg-Builds
1
0
Fork 0
mirror of https://github.com/BtbN/FFmpeg-Builds.git synced 2025-06-12 05:17:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add more explicit cache image name

Browse Source
This commit is contained in:
BtbN
2023-06-20 23:26:40 +02:00
parent 3e75fcc0e4
commit 8c336b4dec
8 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/get_dl_cache_tag.sh Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
set -eo pipefail
printf dlcache_
tail -n+3 Dockerfile.dl | sha256sum | cut -d' ' -f1

9
util/vars.sh
View File

@ -36,12 +36,13 @@ REGISTRY="${REGISTRY_OVERRIDE:-ghcr.io}"
BASE_IMAGE="${REGISTRY}/${REPO}/base:latest"
TARGET_IMAGE="${REGISTRY}/${REPO}/base-${TARGET}:latest"
IMAGE="${REGISTRY}/${REPO}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}:latest"
DL_IMAGE="${REGISTRY}/${REPO}/dl_cache:latest"
DL_IMAGE_RAW="${REGISTRY}/${REPO}/dl_cache"
if [[ -n "$REGISTRY_OVERRIDE_DL" && -n "$GITHUB_REPOSITORY_DL" ]]; then
DL_IMAGE="${REGISTRY_OVERRIDE_DL}/${GITHUB_REPOSITORY_DL}/dl_cache:latest"
DL_IMAGE="${DL_IMAGE,,}"
DL_IMAGE_RAW="${REGISTRY_OVERRIDE_DL}/${GITHUB_REPOSITORY_DL}/dl_cache"
DL_IMAGE_RAW="${DL_IMAGE_RAW,,}"
fi
DL_IMAGE="${DL_IMAGE_RAW}:unset"
ffbuild_dockerdl() {
default_dl "$SELF"
@ -52,7 +53,7 @@ ffbuild_dockerlayer_dl() {
}
ffbuild_dockerstage() {
to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw SELF=\"$SELF\" run_stage /stage.sh"
to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw run_stage /stage.sh"
}
ffbuild_dockerlayer() {