Align the bootc distro package with the generic one#2136
Merged
Conversation
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
force-pushed
the
align-bootc-with-generic-p1
branch
from
January 16, 2026 14:53
f0f06f0 to
07ab298
Compare
Member
Author
|
Rebased. |
lzap
approved these changes
Jan 16, 2026
achilleas-k
pushed a commit
to achilleas-k/image-builder
that referenced
this pull request
Jun 17, 2026
This bumps the osbuild/images to the version that uses depsolver V2 API. Also bump the minimum required osbuild version and pin it in the Schutzfile. Changes with 0.235.0 ---------------- - Align the bootc distro package with the generic one (osbuild#2136) - Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Tomáš Hozza - Ensure pinned osbuild version is used consistently in CI and build command. (HMS-10070) (osbuild#2145) - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger - GHA: bump used golangci-lint version to 2.8 (HMS-10069) (osbuild#2144) - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Lukáš Zapletal - Update osbuild dependency commit ID (osbuild#2141) - Author: SchutzBot, Reviewers: Achilleas Koutsou, Tomáš Hozza - Use the correct libvirt pool instead of hardcoded default (osbuild#2147) - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger - boot-image: add make_check_host_config to boot-aws (osbuild#2143) - Author: Lukáš Zapletal, Reviewers: Simon de Vlieger, Tomáš Hozza - osbuild: add force option to org.osbuild.groups and always enable [HMS-9825] (osbuild#2146) - Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Lukáš Zapletal, Tomáš Hozza — Somewhere on the Internet, 2026-01-26 --- Changes with 0.236.0 ---------------- - Add V2 depsolver API support and make it the default (HMS-10029) (osbuild#2139) - Author: Tomáš Hozza, Reviewers: Lukáš Zapletal, Simon de Vlieger — Somewhere on the Internet, 2026-01-26 Signed-off-by: Tomáš Hozza <thozza@redhat.com>
achilleas-k
pushed a commit
to achilleas-k/image-builder
that referenced
this pull request
Jun 17, 2026
This bumps the osbuild/images to the version that uses depsolver V2 API. Also bump the minimum required osbuild version and pin it in the Schutzfile. Changes with 0.235.0 ---------------- - Align the bootc distro package with the generic one (osbuild#2136) - Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Tomáš Hozza - Ensure pinned osbuild version is used consistently in CI and build command. (HMS-10070) (osbuild#2145) - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger - GHA: bump used golangci-lint version to 2.8 (HMS-10069) (osbuild#2144) - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Lukáš Zapletal - Update osbuild dependency commit ID (osbuild#2141) - Author: SchutzBot, Reviewers: Achilleas Koutsou, Tomáš Hozza - Use the correct libvirt pool instead of hardcoded default (osbuild#2147) - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger - boot-image: add make_check_host_config to boot-aws (osbuild#2143) - Author: Lukáš Zapletal, Reviewers: Simon de Vlieger, Tomáš Hozza - osbuild: add force option to org.osbuild.groups and always enable [HMS-9825] (osbuild#2146) - Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Lukáš Zapletal, Tomáš Hozza — Somewhere on the Internet, 2026-01-26 --- Changes with 0.236.0 ---------------- - Add V2 depsolver API support and make it the default (HMS-10029) (osbuild#2139) - Author: Tomáš Hozza, Reviewers: Lukáš Zapletal, Simon de Vlieger — Somewhere on the Internet, 2026-01-26 Signed-off-by: Tomáš Hozza <thozza@redhat.com>
achilleas-k
pushed a commit
to achilleas-k/image-builder
that referenced
this pull request
Jun 18, 2026
This bumps the osbuild/images to the version that uses depsolver V2 API. Also bump the minimum required osbuild version and pin it in the Schutzfile. Changes with 0.235.0 ---------------- - Align the bootc distro package with the generic one (osbuild#2136) - Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Tomáš Hozza - Ensure pinned osbuild version is used consistently in CI and build command. (HMS-10070) (osbuild#2145) - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger - GHA: bump used golangci-lint version to 2.8 (HMS-10069) (osbuild#2144) - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Lukáš Zapletal - Update osbuild dependency commit ID (osbuild#2141) - Author: SchutzBot, Reviewers: Achilleas Koutsou, Tomáš Hozza - Use the correct libvirt pool instead of hardcoded default (osbuild#2147) - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger - boot-image: add make_check_host_config to boot-aws (osbuild#2143) - Author: Lukáš Zapletal, Reviewers: Simon de Vlieger, Tomáš Hozza - osbuild: add force option to org.osbuild.groups and always enable [HMS-9825] (osbuild#2146) - Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Lukáš Zapletal, Tomáš Hozza — Somewhere on the Internet, 2026-01-26 --- Changes with 0.236.0 ---------------- - Add V2 depsolver API support and make it the default (HMS-10029) (osbuild#2139) - Author: Tomáš Hozza, Reviewers: Lukáš Zapletal, Simon de Vlieger — Somewhere on the Internet, 2026-01-26 Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.