build(iso): switch default Debian mirror, add --mirror override
mirror.mephi.ru was timing out during lb binary_rootfs. Default to deb.debian.org (Fastly-backed, geo-balanced) and allow overriding via --mirror on build-in-container.sh/build.sh, or BEE_MIRROR in auto/config. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -23,6 +23,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
LB_HOSTNAME="${BEE_HOSTNAME:-easy-bee}"
|
LB_HOSTNAME="${BEE_HOSTNAME:-easy-bee}"
|
||||||
|
LB_MIRROR="${BEE_MIRROR:-http://deb.debian.org/debian/}"
|
||||||
|
|
||||||
lb config noauto \
|
lb config noauto \
|
||||||
--distribution bookworm \
|
--distribution bookworm \
|
||||||
@@ -31,9 +32,9 @@ lb config noauto \
|
|||||||
--bootloaders "grub-efi,syslinux" \
|
--bootloaders "grub-efi,syslinux" \
|
||||||
--debian-installer none \
|
--debian-installer none \
|
||||||
--archive-areas "main contrib non-free non-free-firmware" \
|
--archive-areas "main contrib non-free non-free-firmware" \
|
||||||
--mirror-bootstrap "http://mirror.mephi.ru/debian/" \
|
--mirror-bootstrap "${LB_MIRROR}" \
|
||||||
--mirror-chroot "http://mirror.mephi.ru/debian/" \
|
--mirror-chroot "${LB_MIRROR}" \
|
||||||
--mirror-binary "http://mirror.mephi.ru/debian/" \
|
--mirror-binary "${LB_MIRROR}" \
|
||||||
--security true \
|
--security true \
|
||||||
--linux-flavours "amd64" \
|
--linux-flavours "amd64" \
|
||||||
--linux-packages "${LB_LINUX_PACKAGES}" \
|
--linux-packages "${LB_LINUX_PACKAGES}" \
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ CACHE_DIR="${BEE_BUILDER_CACHE_DIR:-${REPO_ROOT}/dist/cache}"
|
|||||||
AUTH_KEYS=""
|
AUTH_KEYS=""
|
||||||
CLEAN_CACHE=0
|
CLEAN_CACHE=0
|
||||||
VARIANT="all"
|
VARIANT="all"
|
||||||
|
MIRROR=""
|
||||||
|
|
||||||
. "${BUILDER_DIR}/VERSIONS"
|
. "${BUILDER_DIR}/VERSIONS"
|
||||||
|
|
||||||
@@ -33,9 +34,13 @@ while [ $# -gt 0 ]; do
|
|||||||
VARIANT="$2"
|
VARIANT="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
|
--mirror)
|
||||||
|
MIRROR="$2"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
echo "unknown arg: $1" >&2
|
echo "unknown arg: $1" >&2
|
||||||
echo "usage: $0 [--cache-dir /path] [--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] [--mirror http://host/debian/]" >&2
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@@ -156,10 +161,12 @@ run_variant() {
|
|||||||
-e TMPDIR=/cache/tmp \
|
-e TMPDIR=/cache/tmp \
|
||||||
-e BEE_CACHE_DIR=/cache/bee \
|
-e BEE_CACHE_DIR=/cache/bee \
|
||||||
-e BEE_REQUIRE_MEMTEST=1 \
|
-e BEE_REQUIRE_MEMTEST=1 \
|
||||||
|
${MIRROR:+-e "BEE_MIRROR=${MIRROR}"} \
|
||||||
-w /work \
|
-w /work \
|
||||||
"${IMAGE_REF}" \
|
"${IMAGE_REF}" \
|
||||||
sh /work/iso/builder/build.sh --variant "${_v}" \
|
sh /work/iso/builder/build.sh --variant "${_v}" \
|
||||||
--authorized-keys "/tmp/bee-authkeys/${AUTH_KEYS_BASE}"
|
--authorized-keys "/tmp/bee-authkeys/${AUTH_KEYS_BASE}" \
|
||||||
|
${MIRROR:+--mirror "${MIRROR}"}
|
||||||
else
|
else
|
||||||
"$CONTAINER_TOOL" run --rm --privileged \
|
"$CONTAINER_TOOL" run --rm --privileged \
|
||||||
--platform "${BUILDER_PLATFORM}" \
|
--platform "${BUILDER_PLATFORM}" \
|
||||||
@@ -171,9 +178,11 @@ run_variant() {
|
|||||||
-e TMPDIR=/cache/tmp \
|
-e TMPDIR=/cache/tmp \
|
||||||
-e BEE_CACHE_DIR=/cache/bee \
|
-e BEE_CACHE_DIR=/cache/bee \
|
||||||
-e BEE_REQUIRE_MEMTEST=1 \
|
-e BEE_REQUIRE_MEMTEST=1 \
|
||||||
|
${MIRROR:+-e "BEE_MIRROR=${MIRROR}"} \
|
||||||
-w /work \
|
-w /work \
|
||||||
"${IMAGE_REF}" \
|
"${IMAGE_REF}" \
|
||||||
sh /work/iso/builder/build.sh --variant "${_v}"
|
sh /work/iso/builder/build.sh --variant "${_v}" \
|
||||||
|
${MIRROR:+--mirror "${MIRROR}"}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ while [ $# -gt 0 ]; do
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
--authorized-keys) AUTH_KEYS="$2"; shift 2 ;;
|
--authorized-keys) AUTH_KEYS="$2"; shift 2 ;;
|
||||||
--variant) BUILD_VARIANT="$2"; shift 2 ;;
|
--variant) BUILD_VARIANT="$2"; shift 2 ;;
|
||||||
|
--mirror) BEE_MIRROR="$2"; shift 2 ;;
|
||||||
*) echo "unknown arg: $1"; exit 1 ;;
|
*) echo "unknown arg: $1"; exit 1 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
@@ -55,6 +56,9 @@ BUILD_WORK_DIR="${DIST_DIR}/cache/live-build-work-${BUILD_VARIANT}"
|
|||||||
OVERLAY_STAGE_DIR="${DIST_DIR}/cache/overlay-stage-${BUILD_VARIANT}"
|
OVERLAY_STAGE_DIR="${DIST_DIR}/cache/overlay-stage-${BUILD_VARIANT}"
|
||||||
|
|
||||||
export BEE_GPU_VENDOR BEE_NVIDIA_MODULE_FLAVOR BUILD_VARIANT
|
export BEE_GPU_VENDOR BEE_NVIDIA_MODULE_FLAVOR BUILD_VARIANT
|
||||||
|
if [ -n "${BEE_MIRROR:-}" ]; then
|
||||||
|
export BEE_MIRROR
|
||||||
|
fi
|
||||||
|
|
||||||
. "${BUILDER_DIR}/VERSIONS"
|
. "${BUILDER_DIR}/VERSIONS"
|
||||||
export MEMTEST_VERSION
|
export MEMTEST_VERSION
|
||||||
|
|||||||
Reference in New Issue
Block a user