From d109e08fabcfb076550fdeff25f08e002e6bf19f Mon Sep 17 00:00:00 2001 From: Mikhail Chusavitin Date: Wed, 29 Apr 2026 10:01:57 +0300 Subject: [PATCH] Drop redundant rebuild-image flag --- iso/README.md | 4 ++-- iso/builder/build-in-container.sh | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/iso/README.md b/iso/README.md index ab63bf2..727162f 100644 --- a/iso/README.md +++ b/iso/README.md @@ -31,10 +31,10 @@ Build with explicit SSH keys baked into the ISO: sh iso/builder/build-in-container.sh --authorized-keys ~/.ssh/id_ed25519.pub ``` -Rebuild the builder image: +Force a clean rebuild of the builder image and build caches: ```sh -sh iso/builder/build-in-container.sh --rebuild-image +sh iso/builder/build-in-container.sh --clean-build ``` Use a custom cache directory: diff --git a/iso/builder/build-in-container.sh b/iso/builder/build-in-container.sh index 1c8a4e7..38a687c 100755 --- a/iso/builder/build-in-container.sh +++ b/iso/builder/build-in-container.sh @@ -10,7 +10,6 @@ IMAGE_TAG="${BEE_BUILDER_IMAGE:-bee-iso-builder}" BUILDER_PLATFORM="${BEE_BUILDER_PLATFORM:-linux/amd64}" CACHE_DIR="${BEE_BUILDER_CACHE_DIR:-${REPO_ROOT}/dist/container-cache}" AUTH_KEYS="" -REBUILD_IMAGE=0 CLEAN_CACHE=0 VARIANT="all" @@ -22,17 +21,12 @@ while [ $# -gt 0 ]; do CACHE_DIR="$2" shift 2 ;; - --rebuild-image) - REBUILD_IMAGE=1 - shift - ;; --authorized-keys) AUTH_KEYS="$2" shift 2 ;; --clean-build) CLEAN_CACHE=1 - REBUILD_IMAGE=1 shift ;; --variant) @@ -41,7 +35,7 @@ while [ $# -gt 0 ]; do ;; *) echo "unknown arg: $1" >&2 - echo "usage: $0 [--cache-dir /path] [--rebuild-image] [--clean-build] [--authorized-keys /path/to/authorized_keys] [--variant nvidia|nvidia-legacy|amd|nogpu|all]" >&2 + echo "usage: $0 [--cache-dir /path] [--clean-build] [--authorized-keys /path/to/authorized_keys] [--variant nvidia|nvidia-legacy|amd|nogpu|all]" >&2 exit 1 ;; esac @@ -105,7 +99,7 @@ image_matches_platform() { } NEED_BUILD_IMAGE=0 -if [ "$REBUILD_IMAGE" = "1" ]; then +if [ "$CLEAN_CACHE" = "1" ]; then NEED_BUILD_IMAGE=1 elif ! "$CONTAINER_TOOL" image inspect "${IMAGE_REF}" >/dev/null 2>&1; then NEED_BUILD_IMAGE=1