many: drop custom `distrodefs` and use images library by mvo5 · Pull Request #1066 · osbuild/bootc-image-builder

mvo5 · 2025-10-06T07:44:48Z

Instead of having a separate implementation of the required
packages and the required lorax templates and similar we
now reuse the images data/distrodefs YAML so that all
the packages/definitions are maintained in a central place.

The one issue with this is that we no longer support the distrodefs
path concept:

var distroDefPaths = []string{
	"./data/defs",
	"./bib/data/defs",
	"/usr/share/bootc-image-builder/defs",
}

I'm 95% sure this is not used outside of testing but I wanted to call it out.

bib: add support for ID_LIKE when finding the distro YAML

This commit adds a fallback check when no direct match for
the distro ID from the bootc image is found. As long as
the bootc container sets a correct ID_LIKE we should
automatically have the same behavior as before when
we used symlinks as aliases.

If needed we might need to reintroduce an explicit
mapping like:

// mapping of distro IDs that are compatible with
var distroCompat = map[string]string{
        "almalinux":     "rhel",
        "aurora":        "fedora",
        "aurora-helium": "rhel",
        "bazzite":       "fedora",
        "bluefin":       "fedora",
        "heliumos":      "rhel",
        "rocky":         "rhel",
}

but lets hope we don't need this.

Note that these tests use the "real" distros.yaml from the images library
so make sure that if rhel-9 goes away the test is updated for rhel-XY
(only the version needs to change)

bib: use images library for shared bootc helpers

Reuse the helpers from the images library for to do:

labelForISO()
getDistroAndRunner()

This code moved into images as part of
osbuild/images#1906
and we can now reuse it here instead of duplicating it.

bib: drop no-longer used NullWorkload

Workloads are no longer used in the images library. This
NullWorkload is also no longer used so drop it.

This commits adds a new `bootc-rpm-installer` image type that contains only the rpm packages lists for now so that bootc-image-builder can use the images library to get what rpm package it needs to install to build a bootable ISO. The advantage is that we can retire the code in bib that the YAML loading for the pacakge lists and that we have one central location when we need to update image definitions. This is used by osbuild/bootc-image-builder#1066

This commits adds a new `bootc-rpm-installer` image type that contains only the rpm packages lists and installer config for now so that bootc-image-builder can use the images library to get what rpm package it needs to install to build a bootable ISO. The advantage is that we can retire the code in bib that the YAML loading for the pacakge lists and that we have one central location when we need to update image definitions. Note that this image type is not visible by default because the loader will skip image types that have no filename set. This is used by osbuild/bootc-image-builder#1066

This commits adds a new `bootc-rpm-installer` image type that contains only the rpm packages lists and installer config for now so that bootc-image-builder can use the images library to get what rpm package it needs to install to build a bootable ISO. The advantage is that we can retire the code in bib that the YAML loading for the pacakge lists and that we have one central location when we need to update image definitions. The other advantage is that all the syntax for conditions on the exact version works. Note that this image type is not visible by default because the loader will skip image types that have no filename set. This is used by osbuild/bootc-image-builder#1066

thozza

LGTM, nice cleanup 👏

thozza · 2025-11-05T12:43:23Z

bib/cmd/bootc-image-builder/legacy_iso.go

 	if err != nil {
 		return nil, err
 	}
+	// XXX: or "bootc-legacy-installer"?


or bootc-package-installer based on "image mode" vs. "package mode"... I have no preference.

I prefer bootc-package-installer to bootc-rpm-installer. But I think legacy might be clearer here as something we want people to start moving away from.

mvo5 · 2025-11-10T11:40:50Z

Sorry, had to force push because of conflicts.

Also update for the renaming of image.NewAnacondaContainerInstaller to image.NewAnacondaContainerInstallerLegacy

Instead of having a separate implementation of the required packages and the required lorax templates and similar we now reuse the images `data/distrodefs` YAML so that all the packages/definitions are maintained in a central place.

This commit adds a fallback check when no direct match for the distro ID from the bootc image is found. As long as the bootc container sets a correct `ID_LIKE` we should automatically have the same behavior as before when we used symlinks as aliases. If needed we might need to reintroduce an explicit mapping like: ```go // mapping of distro IDs that are compatible with var distroCompat = map[string]string{ "almalinux": "rhel", "aurora": "fedora", "aurora-helium": "rhel", "bazzite": "fedora", "bluefin": "fedora", "heliumos": "rhel", "rocky": "rhel", } ``` but lets hope we don't need this. Note that these tests use the "real" distros.yaml from the images library so make sure that if rhel-9 goes away the test is updated for rhel-XY (only the version needs to change)

Reuse the helpers from the `images` library for to do: - labelForISO() - getDistroAndRunner() This code moved into images as part of osbuild/images#1906 and we can now reuse it here instead of duplicating it.

Workloads are no longer used in the images library. This NullWorkload is also no longer used so drop it.

achilleas-k

Very cool. LGTM

mvo5 · 2025-11-21T09:56:59Z

I'm closing this in favor of osbuild/image-builder-cli#374 and #1157 - I think instead of this we can focus on making it a multicall binary directly. If it turns out to be too difficult/too much churn in a single go we can revisit/reopen this PR.

mvo5 force-pushed the use-distro-yaml-for-legacy-iso branch 2 times, most recently from 945a411 to 7cd20c3 Compare October 28, 2025 09:37

mvo5 mentioned this pull request Oct 28, 2025

distro,manifest: have a single LoraxTemplates type osbuild/images#1975

Merged

mvo5 force-pushed the use-distro-yaml-for-legacy-iso branch from a86d875 to 5745939 Compare October 29, 2025 11:24

mvo5 mentioned this pull request Oct 29, 2025

distrodefs: add new (hidden) bootc-rpm-installer imgtype osbuild/images#1979

Merged

mvo5 changed the title ~~many: drop custom distrodefs and use images DistroYAML~~ many: drop custom distrodefs and use images library Oct 29, 2025

mvo5 force-pushed the use-distro-yaml-for-legacy-iso branch from 5ab0689 to 848ef51 Compare November 5, 2025 08:01

mvo5 marked this pull request as ready for review November 5, 2025 08:01

mvo5 requested a review from a team as a code owner November 5, 2025 08:01

mvo5 requested review from achilleas-k, croissanne and thozza and removed request for a team November 5, 2025 08:01

mvo5 mentioned this pull request Nov 5, 2025

bib: simplify manifestFromCobraForLegacyISO #1101

Closed

thozza previously approved these changes Nov 5, 2025

View reviewed changes

mvo5 dismissed thozza’s stale review via 670c994 November 10, 2025 11:40

mvo5 force-pushed the use-distro-yaml-for-legacy-iso branch from 848ef51 to 670c994 Compare November 10, 2025 11:40

thozza approved these changes Nov 10, 2025

View reviewed changes

mvo5 added 2 commits November 11, 2025 13:24

go.mod: update images to v0.214.0

e225353

Also update for the renaming of image.NewAnacondaContainerInstaller to image.NewAnacondaContainerInstallerLegacy

mvo5 added 4 commits November 11, 2025 13:24

bib: use images library for shared bootc helpers

f9d932a

Reuse the helpers from the `images` library for to do: - labelForISO() - getDistroAndRunner() This code moved into images as part of osbuild/images#1906 and we can now reuse it here instead of duplicating it.

bib: drop no-longer used NullWorkload

f1b801a

Workloads are no longer used in the images library. This NullWorkload is also no longer used so drop it.

bib: drop no longer needed ManifestConfig.DistroDefPaths

1de1ad1

achilleas-k force-pushed the use-distro-yaml-for-legacy-iso branch from 670c994 to 1de1ad1 Compare November 11, 2025 12:24

achilleas-k approved these changes Nov 11, 2025

View reviewed changes

achilleas-k enabled auto-merge November 11, 2025 12:31

mvo5 closed this Nov 21, 2025

auto-merge was automatically disabled November 21, 2025 09:56
Pull request was closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

many: drop custom `distrodefs` and use images library#1066

many: drop custom `distrodefs` and use images library#1066
mvo5 wants to merge 6 commits intoosbuild:mainfrom
mvo5:use-distro-yaml-for-legacy-iso

mvo5 commented Oct 6, 2025 •

edited

Loading

Uh oh!

thozza left a comment

Uh oh!

thozza Nov 5, 2025

Uh oh!

achilleas-k Nov 11, 2025

Uh oh!

mvo5 commented Nov 10, 2025

Uh oh!

achilleas-k left a comment

Uh oh!

mvo5 commented Nov 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

mvo5 commented Oct 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thozza left a comment

Choose a reason for hiding this comment

Uh oh!

thozza Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

achilleas-k Nov 11, 2025

Choose a reason for hiding this comment

Uh oh!

mvo5 commented Nov 10, 2025

Uh oh!

achilleas-k left a comment

Choose a reason for hiding this comment

Uh oh!

mvo5 commented Nov 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mvo5 commented Oct 6, 2025 •

edited

Loading