From ec89eb58bd3881f67ef4723513ac6874b7373609 Mon Sep 17 00:00:00 2001 From: Sam & Claude Date: Mon, 22 Jun 2026 06:27:38 +0200 Subject: [PATCH] build: pin zot v0.2.29 -> v0.2.42 Bumps the zot agent tag the image ships, consistently across build.cfg, the preflight hint (build.sh), the staging hint (stage-zot-iso.sh), and the live-rebuild doc. Continues work started by Codex (chore/zot-0.2.42-pin). Co-Authored-By: Claude Opus 4.8 --- build.cfg | 4 ++-- build.sh | 4 ++-- docs/LIVE-COLIBRI-REBUILD.md | 4 ++-- scripts/stage-zot-iso.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.cfg b/build.cfg index 6526e6e6..fe6375ed 100644 --- a/build.cfg +++ b/build.cfg @@ -113,7 +113,7 @@ COLIBRI_COST_MODE="${COLIBRI_COST_MODE:-smart}" # COLIBRI_STAGE_AGENT=NO stages the daemon without the agent (debug builds). # Pin a tag for reproducible images; the agent has no FreeBSD release, so the # build host compiles it: (cd $ZOT_REPO && git checkout $ZOT_VERSION && -# ZOT_BUILD_VERSION="${ZOT_VERSION:-v0.2.29}" && VERSION="${ZOT_BUILD_VERSION#v}" make build) +# ZOT_BUILD_VERSION="${ZOT_VERSION:-v0.2.42}" && VERSION="${ZOT_BUILD_VERSION#v}" make build) COLIBRI_STAGE_AGENT="${COLIBRI_STAGE_AGENT:-YES}" # Development-only local fake-agent binary. Auto mode includes it for dev # builds and omits it from release/prod images; override with YES/NO for @@ -125,7 +125,7 @@ if [ "${COLIBRI_STAGE_TEST_AGENT}" = "auto" ]; then *) COLIBRI_STAGE_TEST_AGENT="YES" ;; esac fi -ZOT_VERSION="${ZOT_VERSION:-v0.2.29}" +ZOT_VERSION="${ZOT_VERSION:-v0.2.42}" ZOT_REPO="${ZOT_REPO:-/home/clawdie/ai/zot}" ZOT_ARTIFACT_DIR="${ZOT_ARTIFACT_DIR:-}" # Optional: bake the operator's DeepSeek key into the agent's auth.json (0600). diff --git a/build.sh b/build.sh index 4f7eca92..4ca73db2 100755 --- a/build.sh +++ b/build.sh @@ -378,8 +378,8 @@ preflight_zot_artifacts() { command -v go >/dev/null 2>&1 || \ echo " NOTE: go toolchain not found on this host — install it: pkg install go" echo " The agent has no FreeBSD release — build it first:" - echo " (cd ${_resolved_zot_repo} && git checkout ${ZOT_VERSION:-v0.2.29} && \\" - echo " ZOT_BUILD_VERSION=\"\${ZOT_VERSION:-v0.2.29}\" && VERSION=\"\${ZOT_BUILD_VERSION#v}\" make build)" + echo " (cd ${_resolved_zot_repo} && git checkout ${ZOT_VERSION:-v0.2.42} && \\" + echo " ZOT_BUILD_VERSION=\"\${ZOT_VERSION:-v0.2.42}\" && VERSION=\"\${ZOT_BUILD_VERSION#v}\" make build)" echo " Or set COLIBRI_STAGE_AGENT=NO to skip agent staging." exit 1 fi diff --git a/docs/LIVE-COLIBRI-REBUILD.md b/docs/LIVE-COLIBRI-REBUILD.md index 9d52a503..75487049 100644 --- a/docs/LIVE-COLIBRI-REBUILD.md +++ b/docs/LIVE-COLIBRI-REBUILD.md @@ -195,8 +195,8 @@ if [ ! -d zot-build/.git ]; then fi cd zot-build git fetch --prune origin -git checkout v0.2.29 # the zot tag this image ships (see build-manifest.json) -ZOT_BUILD_VERSION="${ZOT_VERSION:-v0.2.29}" +git checkout v0.2.42 # the zot tag this image ships (see build-manifest.json) +ZOT_BUILD_VERSION="${ZOT_VERSION:-v0.2.42}" VERSION="${ZOT_BUILD_VERSION#v}" make build ./bin/zot --version ``` diff --git a/scripts/stage-zot-iso.sh b/scripts/stage-zot-iso.sh index 96126f45..1d45e3cc 100755 --- a/scripts/stage-zot-iso.sh +++ b/scripts/stage-zot-iso.sh @@ -4,7 +4,7 @@ # zot is the agent-harness consolidation target (one static Go binary). It has no # FreeBSD release, so build it on the host first and point ZOT_ARTIFACT_DIR here: # (cd ../zot && git checkout "$ZOT_VERSION" \ -# && ZOT_BUILD_VERSION="${ZOT_VERSION:-v0.2.29}" \ +# && ZOT_BUILD_VERSION="${ZOT_VERSION:-v0.2.42}" \ # && VERSION="${ZOT_BUILD_VERSION#v}" make build) # # Credentials: zot resolves provider keys as --api-key -> provider env var -> @@ -36,7 +36,7 @@ ZOT_HOME="${OP_HOME}/${ZOT_HOME_REL}" if [ ! -x "${BIN_SRC}" ]; then echo "missing executable zot artifact: ${BIN_SRC}" >&2 - echo "hint: (cd \$ZOT_REPO && ZOT_BUILD_VERSION=\"\${ZOT_VERSION:-v0.2.29}\" && VERSION=\"\${ZOT_BUILD_VERSION#v}\" make build)" >&2 + echo "hint: (cd \$ZOT_REPO && ZOT_BUILD_VERSION=\"\${ZOT_VERSION:-v0.2.42}\" && VERSION=\"\${ZOT_BUILD_VERSION#v}\" make build)" >&2 exit 66 fi