diff --git a/Dockerfile b/Dockerfile index 66f97342..15e81253 100644 --- a/Dockerfile +++ b/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 diff --git a/crates/tests-integration/src/system_reinstall.rs b/crates/tests-integration/src/system_reinstall.rs index 91e12fc2..69699737 100644 --- a/crates/tests-integration/src/system_reinstall.rs +++ b/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")?;