Skip to content

images: Use image-builder package for building bootc images #9201

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
jelly wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

images: Use image-builder package for building bootc images #9201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions images/scripts/fedora.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ su builder -c "/usr/bin/mock --install /tmp/selinux-policy-rpms/*.rpm"
# host system gets the versions with fedora-updates enabled
dnf install -y $selinux_pkgs

# For building bootc images
dnf install -y image-builder

# for c-podman tests
/var/lib/testvm/podman-images.setup

Expand Down
17 changes: 4 additions & 13 deletions images/scripts/lib/bootc.bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
#!/usr/bin/python3

# osbuild needs a privileged container with kvm, so we can't build or run this
# directly in our CI tasks container or GitHub workflows; so run it in a VM.

import argparse
import json
import os
Expand Down Expand Up @@ -33,7 +30,7 @@ m.execute(f'podman build -f lib/bootc.Containerfile -t {OCI_TAG} --build-arg bas
timeout=720, stdout=None)

# convert container to qcow2 with image builder
# see https://github.com/osbuild/bootc-image-builder?tab=readme-ov-file
# see https://github.com/osbuild/image-builder-cli

pubkey = Path(DEFAULT_IDENTITY_PUB_FILE).read_text().strip()
config = {
Expand All @@ -48,18 +45,12 @@ m.write('/root/config.json', json.dumps(config))

m.execute('mkdir output')

m.execute(['podman', 'run', '--rm', '-i', '--privileged', '--security-opt=label=type:unconfined_t',
# for --local
'--volume=/var/lib/containers/storage:/var/lib/containers/storage',
'--volume=./config.json:/config.json',
'--volume=./output:/output',
'ghcr.io/osbuild/image-builder-cli:latest',
# image-builder args
m.execute(['image-builder',
'build',
'qcow2',
'--bootc-ref', OCI_TAG,
'--blueprint', '/config.json',
'--output-dir', '/output',
'--blueprint', 'config.json',
'--output-dir', 'output',
'--output-name', 'disk.qcow2',
], timeout=720, stdout=None)

Expand Down
Loading