diff options
Diffstat (limited to '.extras/image-builder/build-full-image.sh')
| -rwxr-xr-x | .extras/image-builder/build-full-image.sh | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/.extras/image-builder/build-full-image.sh b/.extras/image-builder/build-full-image.sh index c5f1c36..24cbe1d 100755 --- a/.extras/image-builder/build-full-image.sh +++ b/.extras/image-builder/build-full-image.sh @@ -189,13 +189,23 @@ DOCKERFILE local BUILD_FLAGS=() [[ "${FORCE}" == "true" ]] && BUILD_FLAGS+=(--no-cache) + # Explicit exit checks: build_variant runs in an `if ! (...)` condition + # (see Main), which suppresses `set -e` inside this subshell, so a failed + # docker build would otherwise fall through to push a nonexistent tag and + # log "Done". Check each step and return non-zero on failure. _log " Building ${FULL_TAG}..." - docker build "${BUILD_FLAGS[@]}" \ + if ! docker build "${BUILD_FLAGS[@]}" \ -t "${FULL_TAG}" \ - "${WORKDIR}" + "${WORKDIR}"; then + _warn " build failed for ${FULL_TAG}; not pushing." + return 1 + fi _log " Pushing ${FULL_TAG}..." - docker push "${FULL_TAG}" + if ! docker push "${FULL_TAG}"; then + _warn " push failed for ${FULL_TAG}." + return 1 + fi _log "=== Done: ${FULL_TAG} ===" } @@ -204,6 +214,15 @@ DOCKERFILE # Main # ============================================================================ +# A --force build passes --no-cache, so the stale build cache is dead weight: +# it still loads the containerd snapshotter's lease/lock bookkeeping and has +# raced the layer export ("failed to open writer: ref ... locked ... unavailable"). +# Prune it first to shrink that surface. Best-effort; never fail the build on it. +if [[ "${FORCE}" == "true" ]]; then + _log " --force: pruning build cache before rebuild" + docker builder prune -f >/dev/null 2>&1 || _warn " builder prune failed (ignored)" +fi + rc=0 for VERSION in "${BUILD_VARIANTS[@]}"; do if ! ( build_variant "${VERSION}" ); then |