Skip to content

many: allow bootc #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
supakeen wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

many: allow bootc #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c80770d
many: allow `bootc`
supakeen Sep 23, 2025
99d2a94
many/bootc: `installer-payload-ref`
supakeen Mar 27, 2026
2c7a4c7
builder: simplify bootc ref pulling
supakeen Mar 27, 2026
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
29 changes: 29 additions & 0 deletions plugin/builder/image_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,35 @@ def handler(
if ostree_parent:
cmd.extend(["--ostree-parent", ostree_parent])

# If bootc information is available pass it on to the command
bootc = self.opts.get("bootc")
if bootc:
# Various containers can be used during the build. `ref` is the contents of
# the main artifact. `build-ref` is a custom buildroot. `installer-payload-ref`
# is applicable to (some) installer image types that contain an embedded
# container.
for ref in ["ref", "build-ref", "installer-payload-ref"]:
bootc_ref = bootc.get(ref)
if bootc_ref:
cmd.extend(["--bootc-ref", bootc_ref])
Copy link
Copy Markdown

@bcl bcl Mar 31, 2026

Choose a reason for hiding this comment

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

Needs to match the type of ref. maybe a map or a tuple to associate the cmdline argument with the bootc field.

Copy link
Copy Markdown
Member Author

@supakeen supakeen Apr 1, 2026

Choose a reason for hiding this comment

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

Good catch I had very recently updated this to do a loop and then pushed and forgot. Luckily tests are also failing


# We need to pull the container into local storage, this
# requires the podman executable to be available in our buildroot
exit_code = broot.mock(
["--cwd", broot.tmpdir(within=True), "--chroot", "--",
"podman", "pull", bootc_ref]
)

if exit_code != 0:
raise koji.GenericError(f"`podman` failed to pull container {ref}: {bootc_ref}")

# image-builder tries to determine the root filesystem to use based
# on container metadata and/or contents, for some containers this isnt'
# available so there's an option to set it explicitly
bootc_default_fs = bootc.get("default-fs")
if bootc_default_fs:
cmd.extend(["--bootc-defaultfs", bootc_default_fs])
Copy link
Copy Markdown
Member Author

@supakeen supakeen Mar 27, 2026

Choose a reason for hiding this comment

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

The option is called --bootc-default-fs.


# If a seed is set, set it
seed = opts.get("seed", None)
if seed is not None:
Expand Down
45 changes: 45 additions & 0 deletions plugin/cli/image_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,34 @@ def handle_image_builder_build(gopts, session, args):
help="URL to the OSTree repo for OSTree commit image types",
)

parser.add_option(
"--bootc-ref",
type=str,
dest="bootc_ref",
help="Ref to the bootable container for bootc image types",
)

parser.add_option(
"--bootc-build-ref",
type=str,
dest="bootc_build_ref",
help="Ref to the bootable container build root container for bootc image types",
)

parser.add_option(
"--bootc-installer-payload-ref",
type=str,
dest="bootc_installer_payload_ref",
help="Ref to the bootable container installer payload container for bootc image types",
)

parser.add_option(
"--bootc-default-fs",
type=str,
dest="bootc_default_fs",
help="Set the default root filesystem to use when not defined in the container",
)

parser.add_option(
"--release",
help="Override release of the output, otherwise determined based on 'target' and 'name'",
Expand Down Expand Up @@ -107,13 +135,30 @@ def handle_image_builder_build(gopts, session, args):
if opts.ostree_url:
ostree["url"] = opts.ostree_url

bootc = {}

if opts.bootc_ref:
bootc["ref"] = opts.bootc_ref

if opts.bootc_build_ref:
bootc["build-ref"] = opts.bootc_build_ref

if opts.bootc_installer_payload_ref:
bootc["build-ref"] = opts.bootc_installer_payload_ref

if opts.bootc_default_fs:
bootc["default-fs"] = opts.bootc_default_fs

task_opts = {
"scratch": opts.scratch,
}

if ostree:
task_opts["ostree"] = ostree

if bootc:
task_opts["bootc"] = bootc

if opts.repo:
task_opts["repos"] = opts.repo

Expand Down
16 changes: 16 additions & 0 deletions plugin/hub/image_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@
"url": {"type": "string"},
},
},
"bootc": {
"title": "bootc specific options",
"type": "object",
"additionalProperties": False,
"properties": {
"ref": {"type": "string"},
"build-ref": {"type": "string"},
"installer-payload-ref": {"type": "string"},
"default-fs": {"type": "string"},
},
},
"options": {
"title": "Optional arguments",
"type": "object",
Expand Down Expand Up @@ -75,6 +86,11 @@
"$ref": "#/definitions/ostree",
"descriptions": "Additional ostree options",
},
"bootc": {
"type": "object",
"$ref": "#/definitions/bootc",
"descriptions": "Additional bootc options",
},
"blueprint": {
"type": "object",
"description": "Blueprint",
Expand Down
74 changes: 74 additions & 0 deletions test/unit/test_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,4 +306,78 @@ def test_build_arch_task_seed(koji_mock_kojid):
],
]

def test_build_arch_task_bootc(koji_mock_kojid):
import plugin.builder.image_builder as builder

t = builder.ImageBuilderBuildArchTask()

t.id = None
t.session = None
t.options = MockOptions(topurl="/")
t.workdir = None

t.handler(
"Fedora-bootc",
"42",
"1",
"x86_64",
["qcow2"],
{"build_tag": "f42-build", "build_tag_name": "f42-build"},
{"extra": {"mock.new_chroot": 0}},
{"id": 1},
{
"bootc": {
"ref": "quay.io/centos-bootc/centos-bootc:stream9",
"build-ref": "quay.io/centos-bootc/centos-bootc:stream10",
"default-fs": "ext4",
}
},
)

assert koji_mock_kojid.buildroot.mock_calls == [
[
"--cwd",
str(koji_mock_kojid.buildroot._tmpdir),
"--chroot",
"--",
"podman",
"pull",
"quay.io/centos-bootc/centos-bootc:stream9",
],
[
"--cwd",
str(koji_mock_kojid.buildroot._tmpdir),
"--chroot",
"--",
"podman",
"pull",
"quay.io/centos-bootc/centos-bootc:stream10",
],
[
"--cwd",
str(koji_mock_kojid.buildroot._tmpdir),
"--chroot",
"--",
"sh",
str(koji_mock_kojid.buildroot._tmpdir) + "/mock-wrap",
"image-builder",
"-v",
"build",
"--use-librepo=false",
"--force-repo",
"//repos/f42-build/1/$arch",
"--with-sbom",
"--with-manifest",
"--bootc-ref",
"quay.io/centos-bootc/centos-bootc:stream9",
"--bootc-build-ref",
"quay.io/centos-bootc/centos-bootc:stream10",
"--bootc-defaultfs",
"ext4",
"--output-dir",
"/builddir/output",
"--output-name",
"Fedora-bootc-42-1.x86_64",
"qcow2",
],
]
Loading