containers/bootc
1
0
Fork 0
mirror of https://github.com/containers/bootc.git synced 2026-02-05 15:45:53 +01:00
Code Issues Activity

build-sys: Use stream10 by default

Browse Source 
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 <walters@verbum.org>
This commit is contained in:
Colin Walters
2025-09-28 22:58:27 +02:00
parent 1b2fb5b7e5
commit 7dbb354fa5
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@@ -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

4
crates/tests-integration/src/system_reinstall.rs
View File

@@ -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")?;