From 7e42201d88da7e5ab49fa318d5b14d8826ecf1ce Mon Sep 17 00:00:00 2001 From: mia26MAjFm Date: Tue, 23 Jun 2026 18:03:17 -0400 Subject: [PATCH] image-builder: CACHEBUST arg to force-rebuild umoci layer One org runner has a broken cached layer for the umoci install (runc: "/bin/sh: no such file"). Pass a unique build-arg each invocation so that layer + downstream get rebuilt fresh, while the heavy apt install above stays cached. --- build_image.sh | 3 ++- docker/image-builder/Dockerfile | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build_image.sh b/build_image.sh index 524581e..f5e6348 100755 --- a/build_image.sh +++ b/build_image.sh @@ -355,7 +355,8 @@ fi # --- Step 2: Build distribution image --- run_stage "Build image builder image" \ - docker build --pull -t ps5-image-builder -f "$SCRIPT_DIR/docker/image-builder/Dockerfile" "$SCRIPT_DIR" + docker build --pull --build-arg "CACHEBUST=$(date +%s)" \ + -t ps5-image-builder -f "$SCRIPT_DIR/docker/image-builder/Dockerfile" "$SCRIPT_DIR" if [ "$DISTRO" = "all" ]; then DOCKER_ARGS=( diff --git a/docker/image-builder/Dockerfile b/docker/image-builder/Dockerfile index 6143417..172d64f 100644 --- a/docker/image-builder/Dockerfile +++ b/docker/image-builder/Dockerfile @@ -35,7 +35,13 @@ 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/* -RUN go install github.com/opencontainers/umoci/cmd/umoci@v0.5.0 && \ +# 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 && \ cp /root/go/bin/umoci /usr/local/bin/umoci && \ rm -rf /root/go/pkg