Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(tcr): retry transient CNB image builds

tianma-if5ab291cbcd65
diff --git a/scripts/docker-release.test.mjs b/scripts/docker-release.test.mjs
index cce60f4e..a23de033 100644
--- a/scripts/docker-release.test.mjs
+++ b/scripts/docker-release.test.mjs
@@ -143,7 +143,10 @@ describe("Docker release contract", () => {
expect(tcrPublisher).toContain(
'--label "org.opencontainers.image.revision=${CNB_COMMIT}"',
);
- expect(tcrPublisher).toContain("timeout --signal=TERM --kill-after=1m 45m");
+ expect(tcrPublisher).toContain("readonly build_attempts=3");
+ expect(tcrPublisher).toContain("attempt <= build_attempts");
+ expect(tcrPublisher).toContain("timeout --signal=TERM --kill-after=1m 15m");
+ expect(tcrPublisher).toContain("BuildKit can reuse completed layers");
expect(tcrPublisher).toContain("docker buildx imagetools create \\");
expect(tcrPublisher).toContain("org.opencontainers.image.revision");
expect(tcrPublisher).toContain("--format '{{json .Image}}'");
diff --git a/scripts/publish-tcr-image.sh b/scripts/publish-tcr-image.sh
index 2127a0d9..4bec7a06 100644
--- a/scripts/publish-tcr-image.sh
+++ b/scripts/publish-tcr-image.sh
@@ -44,16 +44,32 @@ printf '%s' "${TCR_PASSWORD}" | docker login \
--password-stdin \
"${TCR_REGISTRY}"
-timeout --signal=TERM --kill-after=1m 45m docker buildx build \
- --platform linux/amd64,linux/arm64 \
- --tag "${TCR_IMAGE}:${primary_tag}" \
- --label "org.opencontainers.image.source=https://github.com/tianma-if/edgeever" \
- --label "org.opencontainers.image.revision=${CNB_COMMIT}" \
- --label "org.opencontainers.image.version=${version}" \
- --cache-from "type=registry,ref=${TCR_IMAGE}:buildcache" \
- --cache-to "type=registry,ref=${TCR_IMAGE}:buildcache,mode=max,image-manifest=true,oci-mediatypes=true" \
- --push \
- .
+trap 'docker logout "${TCR_REGISTRY}" >/dev/null 2>&1 || true' EXIT
+
+readonly build_attempts=3
+for ((attempt = 1; attempt <= build_attempts; attempt += 1)); do
+ echo "Building multi-platform TCR image (attempt ${attempt}/${build_attempts})..."
+ if timeout --signal=TERM --kill-after=1m 15m docker buildx build \
+ --platform linux/amd64,linux/arm64 \
+ --tag "${TCR_IMAGE}:${primary_tag}" \
+ --label "org.opencontainers.image.source=https://github.com/tianma-if/edgeever" \
+ --label "org.opencontainers.image.revision=${CNB_COMMIT}" \
+ --label "org.opencontainers.image.version=${version}" \
+ --cache-from "type=registry,ref=${TCR_IMAGE}:buildcache" \
+ --cache-to "type=registry,ref=${TCR_IMAGE}:buildcache,mode=max,image-manifest=true,oci-mediatypes=true" \
+ --push \
+ .; then
+ break
+ fi
+
+ if ((attempt == build_attempts)); then
+ echo "TCR image build failed after ${build_attempts} attempts." >&2
+ exit 1
+ fi
+
+ echo "Build failed; retrying after a short backoff so BuildKit can reuse completed layers." >&2
+ sleep $((attempt * 10))
+done
primary_inspect="$(docker buildx imagetools inspect "${TCR_IMAGE}:${primary_tag}")"
primary_digest="$(sed -n 's/^Digest:[[:space:]]*//p' <<<"${primary_inspect}" | head -n 1)"