Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -171,26 +171,20 @@ ostree-rechunk $target_image=image_name $tag=default_tag:
# Use the already-built local image to avoid pulling from a remote registry
RPM_OSTREE_CHUNKER_IMAGE="localhost/${target_image}:${tag}"

RPM_OSTREE_OUTPUT_DIR="$(mktemp -d ./"${target_image}"_rpm-ostree_XXXXXX)"
GRAPHROOT="$(podman info --format '{{ '{{.Store.GraphRoot}}' }}')"

trap 'rm -rf "${RPM_OSTREE_OUTPUT_DIR}"' EXIT

podman run --rm \
--pull=never \
podman run --rm --pull=never --privileged \
--mount=type=image,src="${target_image}:${tag}",target=/rpm-ostree \
--privileged \
-v "${RPM_OSTREE_OUTPUT_DIR}:/run/out:Z" \
--mount=type=bind,src=${GRAPHROOT},target=/run/host-container-storage,rw \
--mount=type=tmpfs,target=/run/rpm-ostree-storage \
--entrypoint /usr/bin/rpm-ostree \
"${RPM_OSTREE_CHUNKER_IMAGE}" \

@renner0e renner0e Aug 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small nit, I like that we specify the image we use for rechunking with the variable above, the use case for this might be using a separate image which ships a newer/older rpm-ostree, just seems a little cleaner to me

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forgot to revert that after my testing.

compose build-chunked-oci \
--max-layers 127 \
--format-version=2 \
--bootc \
--rootfs /rpm-ostree \
--output oci-archive:/run/out/"${target_image}.oci"

CHUNKED_IMAGE="$(podman pull oci-archive:"${RPM_OSTREE_OUTPUT_DIR}/${target_image}.oci")"
podman tag "${CHUNKED_IMAGE}" "${target_image}:${tag}"
--output "containers-storage:[overlay@/run/host-container-storage+/run/rpm-ostree-storage]localhost/${target_image}:${tag}"

# Generate Default Tag
[group('Utility')]
Expand Down