From dbd238fcdee2f6102a9652899418c146089d55b5 Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 7 Jul 2021 14:37:58 +0200 Subject: [PATCH] Add option to skip base image (re)build --- makeimage.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/makeimage.sh b/makeimage.sh index 7a9c2b2..5fe9ebf 100755 --- a/makeimage.sh +++ b/makeimage.sh @@ -5,11 +5,13 @@ source util/vars.sh export DOCKER_BUILDKIT=1 -if grep "FROM.*base.*" "images/base-${TARGET}/Dockerfile" >/dev/null 2>&1; then - docker build --tag "$BASE_IMAGE" images/base -fi +if [[ -z "$QUICKBUILD" ]]; then + if grep "FROM.*base.*" "images/base-${TARGET}/Dockerfile" >/dev/null 2>&1; then + docker build --tag "$BASE_IMAGE" images/base + fi -docker build --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}" + docker build --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}" +fi ./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"