Skip to content

Align the bootc distro package with the generic one#2136

Merged
thozza merged 5 commits intoosbuild:mainfrom
achilleas-k:align-bootc-with-generic-p1
Jan 19, 2026
Merged

Align the bootc distro package with the generic one#2136
thozza merged 5 commits intoosbuild:mainfrom
achilleas-k:align-bootc-with-generic-p1

Conversation

@achilleas-k
Copy link
Member

@achilleas-k achilleas-k commented Jan 15, 2026

This is purely a refactoring PR. It's the first step in aligning the way we define the bootc distro, its image types, and the manifest generators with the structure and functions of the generic distro.

The end goal is to make the bootc distro package (the pipeline generators for bootc-based images) have the same interface and behave as much as possible as the other distros. The bootc distro package was initially defined in bootc-image-builder, where we had very different requirements and assumptions about the running environment. Since we merged it here, there's now a lot of duplication and, more importantly, the way we define the bootc-based image types and generate the manifests is very different from the traditional way the manifest generators work.

A big part of this goal is making it simpler to instantiate the manifest without needing to resolve content (resolve the container ref, inspect/run the container), or at least without that happening implicitly. This will be very useful both for mocking (generating manifests without real content) and for having finer control over remote content resolution, like we already do for packages, containers, and ostree refs, which in turn is needed for defining jobs in the osbuild-composer and the service.

@achilleas-k achilleas-k requested a review from a team as a code owner January 15, 2026 18:27
@achilleas-k achilleas-k requested review from bcl, lzap and thozza January 15, 2026 18:27
@achilleas-k
Copy link
Member Author

NOTE: There will be merge conflicts here once some (higher priority) PRs get merged.

Avoids stutter (bootc.BootcImageType) and aligns with the generic
distro (for package-based images).
Aligning with the generic, package-based distro.
Continuing the alignment of the bootc distro to the generic one.  Define
the imageType struct and its methods in a separate file.
Avoids stutter (bootc.BootcArch).
None of these functions implement an interface that requires a specific
signature, so we don't need to include arguments that aren't used.
@achilleas-k achilleas-k force-pushed the align-bootc-with-generic-p1 branch from f0f06f0 to 07ab298 Compare January 16, 2026 14:53
@achilleas-k
Copy link
Member Author

Rebased.

Copy link
Member

@thozza thozza left a comment

Choose a reason for hiding this comment

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

Nice and clean, 🚀 it

@thozza thozza added this pull request to the merge queue Jan 19, 2026
Merged via the queue into osbuild:main with commit 0cc7bd2 Jan 19, 2026
25 checks passed
@achilleas-k achilleas-k deleted the align-bootc-with-generic-p1 branch January 21, 2026 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants