From 875bb35fefa96c2a43419cf13bf186356691fb5f Mon Sep 17 00:00:00 2001 From: mia26MAjFm Date: Tue, 23 Jun 2026 18:13:15 -0400 Subject: [PATCH] image-builder: --no-cache instead of CACHEBUST arg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CACHEBUST only invalidates the umoci layer; the broken cached layer on the Oracle runner is upstream (apt-install), so step 10 still tried to exec /bin/sh from a corrupt parent FS. --no-cache rebuilds every layer fresh — slower (~5 min apt re-run per build) but reliable on every runner regardless of buildkit storage state. --- build_image.sh | 2 +- docker/image-builder/Dockerfile | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/build_image.sh b/build_image.sh index f5e6348..e6fa213 100755 --- a/build_image.sh +++ b/build_image.sh @@ -355,7 +355,7 @@ fi # --- Step 2: Build distribution image --- run_stage "Build image builder image" \ - docker build --pull --build-arg "CACHEBUST=$(date +%s)" \ + docker build --pull --no-cache \ -t ps5-image-builder -f "$SCRIPT_DIR/docker/image-builder/Dockerfile" "$SCRIPT_DIR" if [ "$DISTRO" = "all" ]; then diff --git a/docker/image-builder/Dockerfile b/docker/image-builder/Dockerfile index 172d64f..6143417 100644 --- a/docker/image-builder/Dockerfile +++ b/docker/image-builder/Dockerfile @@ -35,13 +35,7 @@ RUN mkdir -p /root/go/src/github.com/lxc/ && \ RUN apt-get update && apt-get install -y --no-install-recommends \ skopeo \ && rm -rf /var/lib/apt/lists/* -# CACHEBUST: one of the org runners has a broken cached layer for the umoci -# install that fails with `/bin/sh: no such file`. Pass a fresh value via -# `docker build --build-arg CACHEBUST=$(date +%s)` to force rebuild of this -# step (the apt installs above stay cached). -ARG CACHEBUST=0 -RUN echo "cachebust=$CACHEBUST" && \ - go install github.com/opencontainers/umoci/cmd/umoci@v0.5.0 && \ +RUN go install github.com/opencontainers/umoci/cmd/umoci@v0.5.0 && \ cp /root/go/bin/umoci /usr/local/bin/umoci && \ rm -rf /root/go/pkg