From 63651291e90853bbd76443e14541e5868217bc83 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Wed, 10 Jun 2026 08:55:20 +0200 Subject: [PATCH 1/2] Remove requirement for the node image The node image needs to be pulled remotely and we should avoid all possible local reference to the image, in order to embed in the disk image the correct digest. This digest will be, then reported by bootc status, and we want to match it with the digest of the remote image. Signed-off-by: Alice Frosi --- node-images/fedora/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node-images/fedora/Makefile b/node-images/fedora/Makefile index 0629102..b26e3d5 100644 --- a/node-images/fedora/Makefile +++ b/node-images/fedora/Makefile @@ -25,7 +25,7 @@ build-bootc-image: @echo "✅ Bootc image built: $(BOOTC_IMAGE)" # Build the disk image (qcow2 in a scratch container, for use as a podman image volume) -build-disk-image: build-bootc-image +build-disk-image: @echo "=== Building node image with qcow2 disk ===" STORAGE_PATH=$$(podman info --format '{{.Store.GraphRoot}}') && \ if [ -z "$(BOOTC_DIGEST)" ]; then \ From e63042919b773d3e4b653bbec7777ea7ada825da Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Wed, 10 Jun 2026 07:15:09 +0000 Subject: [PATCH 2/2] CI: clean up bootc images and pull from registry for disk build Assisted-by: Claude Opus 4.6 (1M context) Signed-off-by: Alice Frosi --- .github/workflows/build-node-image.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-node-image.yaml b/.github/workflows/build-node-image.yaml index 0a31ee6..a68d5b6 100644 --- a/.github/workflows/build-node-image.yaml +++ b/.github/workflows/build-node-image.yaml @@ -69,13 +69,18 @@ jobs: BOOTC_DIGEST=$(cat /tmp/bootc-digest) echo "digest=${BOOTC_DIGEST}" >> "$GITHUB_OUTPUT" echo "Bootc image pushed with digest: ${BOOTC_DIGEST}" + echo "Clean up local images" + podman rmi -f ${BOOTC_SRC} ${PUSH_DEST}:${TAG} ${PUSH_DEST}:latest + echo "push_dest=${PUSH_DEST}:${TAG}" >> "$GITHUB_OUTPUT" - name: Build disk image working-directory: node-images/fedora run: | BOOTC_DIGEST="${{ steps.push-bootc.outputs.digest }}" - if [ -n "${BOOTC_DIGEST}" ]; then - make build-disk-image BOOTC_DIGEST="${BOOTC_DIGEST}" + PUSH_DEST="${{ steps.push-bootc.outputs.push_dest }}" + if [ -n "${BOOTC_DIGEST}" ] && [ -n "${PUSH_DEST}" ]; then + podman pull "${PUSH_DEST}" + make build-disk-image BOOTC_IMAGE="${PUSH_DEST}" BOOTC_DIGEST="${BOOTC_DIGEST}" else make build-disk-image fi