build-sys: Use stream10 by default

The rationale for having c9s by default was that it's
a lower bound (which is still true). But our CI covers
that; I'd rather now have the default be c10s be the default
as it will be the focus of features going forward.

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

Dockerfile

@@ -1,10 +1,14 @@
-# Build this project from source and drop the updated content on to
-# a bootc container image. By default we use CentOS Stream 9 as a base;
-# use e.g. --build-arg=base=quay.io/fedora/fedora-bootc:41 to target
+# Build this project from source and write the updated content
+# (i.e. /usr/bin/bootc and systemd units) to a new derived container
+# image. See the `Justfile` for an example
+#
+# Use e.g. --build-arg=base=quay.io/fedora/fedora-bootc:42 to target
 # Fedora instead.
 
-ARG base=quay.io/centos-bootc/centos-bootc:stream9
+ARG base=quay.io/centos-bootc/centos-bootc:stream10
 
+# This first image captures a snapshot of the source code,
+# note all the exclusions in .dockerignore.
 FROM scratch as src
 COPY . /src
 
@@ -37,7 +41,7 @@ EORUN
 
 # This image installs build deps, pulls in our source code, and installs updated
 # bootc binaries in /out. The intention is that the target rootfs is extracted from /out
-# back into a final stae (without the build deps etc) below.
+# back into a final stage (without the build deps etc) below.
 FROM base as build
 # Flip this off to disable initramfs code
 ARG initramfs=1

crates/tests-integration/src/system_reinstall.rs

@@ -151,11 +151,11 @@ pub(crate) fn run(image: &str, testargs: libtest_mimic::Arguments) -> Result<()>
 
             // Run system-reinstall-bootc
             let mut p: PtySession = rexpect::spawn(
-                "/usr/bin/system-reinstall-bootc quay.io/centos-bootc/centos-bootc:stream10",
+                "/usr/bin/system-reinstall-bootc quay.io/centos-bootc/centos-bootc:stream9",
                 Some(600000), // Increase timeout for pulling the image
             )?;
 
-            p.exp_string("Image quay.io/centos-bootc/centos-bootc:stream10 is not present locally, pulling it now.")?;
+            p.exp_string("Image quay.io/centos-bootc/centos-bootc:stream9 is not present locally, pulling it now.")?;
             p.exp_regex("Found only one user ([^:]+) with ([\\d]+) SSH authorized keys.")?;
             p.exp_string("[Y/n]")?;
             p.send_line("y")?;