Merge branch 'main' into main

Author: hanthor

.gemini/config.yaml

@@ -0,0 +1,12 @@
+# This config mainly overrides `summary: false` by default
+# as it's really noisy.
+have_fun: true
+code_review:
+  disable: false
+  comment_severity_threshold: MEDIUM
+  max_review_comments: -1
+  pull_request_opened:
+    help: false
+    summary: false # turned off by default
+    code_review: true
+ignore_patterns: []

Cargo.lock

@@ -43,6 +43,7 @@ inherits = "release"
 lto = "yes"
 
 [workspace.dependencies]
+anstream = "0.6"
 anyhow = "1.0.82"
 camino = "1.1.6"
 cap-std-ext = "4.0.3"
@@ -55,6 +56,7 @@ indicatif = "0.17.0"
 fn-error-context = "0.2.1"
 libc = "0.2.154"
 openssl = "0.10.72"
+owo-colors = { version = "4" }
 rustix = { "version" = "1", features = ["thread", "net", "fs", "system", "process", "mount"] }
 serde = "1.0.199"
 serde_json = "1.0.116"

Cargo.toml

@@ -42,7 +42,8 @@ start by looking at [ADOPTERS.md](ADOPTERS.md).
 
 ## Community discussion
 
-The [GitHub discussion forum](https://github.com/bootc-dev/bootc/discussions) is enabled.
+- [Github discussion forum](https://github.com/containers/bootc/discussions) for async discussion
+- [#bootc-dev on CNCF Slack](https://cloud-native.slack.com/archives/C08SKSQKG1L) for live chat
 
 This project is also tightly related to the previously mentioned Fedora/CentOS bootc project,
 and many developers monitor the relevant discussion forums there. In particular there's a

README.md

@@ -14,11 +14,13 @@ default-run = "bootc"
 platforms = ["*-unknown-linux-gnu"]
 
 [dependencies]
+anstream = { workspace = true }
 anyhow = { workspace = true }
 bootc-lib = { version = "1.0", path = "../lib" }
 bootc-utils = { path = "../utils" }
 tokio = { workspace = true, features = ["macros"] }
 log = "0.4.21"
+owo-colors = { workspace = true }
 tracing = { workspace = true }
 
 [lints]

cli/Cargo.toml

@@ -1,5 +1,8 @@
 //! The main entrypoint for bootc, which just performs global initialization, and then
 //! calls out into the library.
+//!
+use std::io::Write as _;
+
 use anyhow::Result;
 
 /// The code called after we've done process global init and created
@@ -32,11 +35,15 @@ fn run() -> Result<()> {
 }
 
 fn main() {
+    use owo_colors::OwoColorize;
+
     // In order to print the error in a custom format (with :#) our
     // main simply invokes a run() where all the work is done.
     // This code just captures any errors.
     if let Err(e) = run() {
-        tracing::error!("{:#}", e);
+        let mut stderr = anstream::stderr();
+        // Don't panic if writing fails
+        let _ = writeln!(stderr, "{}{:#}", "error: ".red(), e);
         std::process::exit(1);
     }
 }

cli/src/main.rs

@@ -7,7 +7,7 @@ readme = "README.md"
 repository = "https://github.com/bootc-dev/bootc"
 # The intention is we'll follow semver here, even though this
 # project isn't actually published as a crate.
-version = "1.2.0"
+version = "1.3.0"
 # In general we try to keep this pinned to what's in the latest RHEL9.
 # However right now, we bumped to 1.82 as that's what composefs-rs uses.
 rust-version = "1.82.0"

lib/Cargo.toml

@@ -279,6 +279,11 @@ pub(crate) enum ContainerOpts {
         /// Example: --skip nonempty-boot --skip baseimage-root
         #[clap(long)]
         skip: Vec<String>,
+
+        /// Don't truncate the output. By default, only a limited number of entries are
+        /// shown for each lint, followed by a count of remaining entries.
+        #[clap(long)]
+        no_truncate: bool,
     },
 }
 
@@ -1012,6 +1017,8 @@ pub fn global_init() -> Result<()> {
         // This shouldn't ever happen
         eprintln!("failed to set name: {e}");
     }
+    // Silence SELinux log warnings
+    ostree::SePolicy::set_null_log();
     let am_root = rustix::process::getuid().is_root();
     // Work around bootc-image-builder not setting HOME, in combination with podman (really c/common)
     // bombing out if it is unset.
@@ -1095,6 +1102,7 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
                 fatal_warnings,
                 list,
                 skip,
+                no_truncate,
             } => {
                 if list {
                     return lints::lint_list(std::io::stdout().lock());
@@ -1112,7 +1120,14 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
 
                 let root = &Dir::open_ambient_dir(rootfs, cap_std::ambient_authority())?;
                 let skip = skip.iter().map(|s| s.as_str());
-                lints::lint(root, warnings, root_type, skip, std::io::stdout().lock())?;
+                lints::lint(
+                    root,
+                    warnings,
+                    root_type,
+                    skip,
+                    std::io::stdout().lock(),
+                    no_truncate,
+                )?;
                 Ok(())
             }
         },

lib/src/cli.rs

@@ -8,9 +8,10 @@
 
 use std::fmt::Write as _;
 use std::future::Future;
+use std::num::NonZeroUsize;
 use std::pin::Pin;
 
-use bootc_utils::iterator_split_nonempty_rest_count;
+use bootc_utils::collect_until;
 use camino::Utf8PathBuf;
 use cap_std::fs::{Dir, MetadataExt as _};
 use cap_std_ext::cap_std;
@@ -250,9 +251,10 @@ async fn check_fsverity_inner(storage: &Storage) -> FsckResult {
     let verity_found_state =
         verity_state_of_all_objects(&storage.repo(), verity_state.desired == Tristate::Enabled)
             .await?;
-    let Some((missing, rest)) =
-        iterator_split_nonempty_rest_count(verity_found_state.missing.iter(), 5)
-    else {
+    let Some((missing, rest)) = collect_until(
+        verity_found_state.missing.iter(),
+        const { NonZeroUsize::new(5).unwrap() },
+    ) else {
         return fsck_ok();
     };
     let mut err = String::from("fsverity enabled, but objects without fsverity:\n");

lib/src/fsck.rs

@@ -535,7 +535,7 @@ impl InstallAleph {
                 l.get(oci_spec::image::ANNOTATION_CREATED)
                     .map(|s| s.as_str())
             })
-            .and_then(crate::status::try_deserialize_timestamp);
+            .and_then(bootc_utils::try_deserialize_timestamp);
         let r = InstallAleph {
             image: src_imageref.imgref.name.clone(),
             version: imgstate.version().as_ref().map(|s| s.to_string()),