Skip to content

Commit d54d764

Browse files
committed
osbuild: use bootc install to deploy the container
Instead of deploying the container to the tree then copy all the contents to the disk image, use bootc to directly manage the installation to the target filesystems. Right now this requires to use the image as the buildroot so this requires python (for osbuild). This is tracked in [1]. As we have python in rawhide now I duplicated the manifest and added a switch in the osbuild wrapper script. We can keep the manifest duplicated until we are confident to roll this to all streams. [1] bootc-dev/bootc#1410 Requires: bootc-dev/bootc#1460 bootc-dev/bootc#1451 osbuild/osbuild#2149 osbuild/osbuild#2152 All of which have landed in osbuild-159 and bootc 1.6
1 parent 56be342 commit d54d764

File tree

2 files changed

+570
-1
lines changed

2 files changed

+570
-1
lines changed

src/cmd-osbuild

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,13 +406,22 @@ main() {
406406
cmd="runvm_with_cache"
407407
fi
408408

409+
# Use the bootc install to-filesystem manifest for rawhide
410+
# See discussion in https://github.com/coreos/coreos-assembler/pull/4224#pullrequestreview-3076134370
411+
# Remove when we switch to use bootc install to-filesystem to all streams
412+
releasever=${build%%.*}
413+
with_bootc_install=""
414+
if [ "$releasever" -ge 44 ]; then
415+
with_bootc_install=".bootc"
416+
fi
417+
409418
# To get a shell in the osbuild supermin VM uncomment this.
410419
# osbuild can be started with `bash tmp/build.<artifact>/cmd.sh`
411420
# See comment about checkpoints in runvm-osbuild
412421
# RUNVM_SHELL=1 \
413422
$cmd -- /usr/lib/coreos-assembler/runvm-osbuild \
414423
--config "${runvm_osbuild_config_json}" \
415-
--mpp "/usr/lib/coreos-assembler/osbuild-manifests/coreos.osbuild.${basearch}.mpp.yaml" \
424+
--mpp "/usr/lib/coreos-assembler/osbuild-manifests/coreos.osbuild.${basearch}${with_bootc_install}.mpp.yaml" \
416425
--outdir "${outdir}" \
417426
--platforms "$(IFS=,; echo "${platforms[*]}")"
418427

0 commit comments

Comments
 (0)