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

Explicitly use buildx for local script

Browse source
This commit is contained in:
BtbN 2021-12-06 19:29:52 +01:00
parent bdf1cc507a
commit 3efcb24f50
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
makeimage.sh
View file

@ -3,16 +3,14 @@ set -xe
cd "$(dirname "$0")"
source util/vars.sh
export DOCKER_BUILDKIT=1
if [[ -z "$QUICKBUILD" ]]; then
if grep "FROM.*base.*" "images/base-${TARGET}/Dockerfile" >/dev/null 2>&1; then
docker build --tag "$BASE_IMAGE" images/base
docker buildx --builder default build --load --tag "$BASE_IMAGE" images/base
fi
docker build --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}"
docker buildx --builder default build --load --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}"
fi
./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"
exec docker build --tag "$IMAGE" .
docker buildx --builder default build --load --tag "$IMAGE" .