Merge pull request #1069 from cgwalters/update-ostree-rs

Update to ostree-rs 0.20
containers · Feb 3, 2025 · 5782980 · 5782980
2 parents 02d5cd3 + cb99cf5
commit 5782980
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 100 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Build container (fedora)
-        run: sudo podman build --build-arg=base=quay.io/fedora/fedora-bootc:40 -t localhost/bootc -f hack/Containerfile . 
+        run: sudo podman build --build-arg=base=quay.io/fedora/fedora-bootc:41 -t localhost/bootc -f hack/Containerfile . 
       - name: Container integration
         run: sudo podman run --rm localhost/bootc bootc-integration-tests container
   cargo-deny:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/hack/Containerfile b/hack/Containerfile
@@ -1,5 +1,5 @@
 # Build bootc from the current git into a c9s-bootc container image.
-# Use e.g. --build-arg=base=quay.io/fedora/fedora-bootc:40 to target
+# Use e.g. --build-arg=base=quay.io/fedora/fedora-bootc:41 to target
 # Fedora instead.
 #
 # You can also generate an image with cloud-init and other dependencies

diff --git a/ostree-ext/Cargo.toml b/ostree-ext/Cargo.toml
@@ -14,7 +14,7 @@ version = "0.15.3"
 # semver here you must also bump our semver.
 containers-image-proxy = "0.7.0"
 # We re-export this library too.
-ostree = { features = ["v2022_6"], version = "0.19.0" }
+ostree = { features = ["v2025_1"], version = "0.20.0" }
 
 # Private dependencies
 anyhow = { workspace = true }

diff --git a/ostree-ext/src/container/encapsulate.rs b/ostree-ext/src/container/encapsulate.rs
@@ -68,7 +68,7 @@ fn commit_meta_to_labels<'a>(
     // Copy standard metadata keys `ostree.bootable` and `ostree.linux`.
     // Bootable is an odd one out in being a boolean.
     #[allow(clippy::explicit_auto_deref)]
-    if let Some(v) = meta.lookup::<bool>(*ostree::METADATA_KEY_BOOTABLE)? {
+    if let Some(v) = meta.lookup::<bool>(ostree::METADATA_KEY_BOOTABLE)? {
         labels.insert(ostree::METADATA_KEY_BOOTABLE.to_string(), v.to_string());
         labels.insert(BOOTC_LABEL.into(), "1".into());
     }

diff --git a/ostree-ext/src/container/store.rs b/ostree-ext/src/container/store.rs
@@ -603,9 +603,9 @@ impl ImageImporter {
     ) -> Result<Box<PreparedImport>> {
         let config_labels = super::labels_of(&config);
         if self.require_bootable {
-            let bootable_key = *ostree::METADATA_KEY_BOOTABLE;
+            let bootable_key = ostree::METADATA_KEY_BOOTABLE;
             let bootable = config_labels.map_or(false, |l| {
-                l.contains_key(bootable_key) || l.contains_key(BOOTC_LABEL)
+                l.contains_key(bootable_key.as_str()) || l.contains_key(BOOTC_LABEL)
             });
             if !bootable {
                 anyhow::bail!("Target image does not have {bootable_key} label");

diff --git a/ostree-ext/src/fixture.rs b/ostree-ext/src/fixture.rs
@@ -414,7 +414,7 @@ fn build_mapping_recurse(
             gio::FileType::Directory => {
                 build_mapping_recurse(path, &child, ret)?;
             }
-            o => anyhow::bail!("Unhandled file type: {}", o),
+            o => anyhow::bail!("Unhandled file type: {o:?}"),
         }
         path.pop();
     }
@@ -725,7 +725,7 @@ impl Fixture {
         metadata.insert("version", &"42.0");
         #[allow(clippy::explicit_auto_deref)]
         if self.bootable {
-            metadata.insert(*ostree::METADATA_KEY_BOOTABLE, &true);
+            metadata.insert(ostree::METADATA_KEY_BOOTABLE, &true);
         }
         let metadata = metadata.to_variant();
         let commit = self.srcrepo.write_commit_with_time(

diff --git a/ostree-ext/src/ima.rs b/ostree-ext/src/ima.rs
@@ -8,7 +8,6 @@ use camino::Utf8PathBuf;
 use fn_error_context::context;
 use gio::glib;
 use gio::prelude::*;
-use glib::Cast;
 use glib::Variant;
 use gvariant::aligned_bytes::TryAsAligned;
 use gvariant::{gv, Marker, Structure};

diff --git a/ostree-ext/src/ostree_prepareroot.rs b/ostree-ext/src/ostree_prepareroot.rs
@@ -9,8 +9,8 @@ use std::str::FromStr;
 use anyhow::{Context, Result};
 use camino::Utf8Path;
 use cap_std_ext::dirext::CapStdExtDirExt;
-use glib::Cast;
 use ocidir::cap_std::fs::Dir;
+use ostree::glib::object::Cast;
 use ostree::prelude::FileExt;
 use ostree::{gio, glib};
 

diff --git a/ostree-ext/src/tar/import.rs b/ostree-ext/src/tar/import.rs
@@ -429,7 +429,7 @@ impl Importer {
                 match &mut self.data {
                     ImporterMode::ObjectSet(_) => {
                         anyhow::bail!(
-                            "Found metadata object {}.{} in object set mode",
+                            "Found metadata object {}.{:?} in object set mode",
                             checksum,
                             objtype
                         );

diff --git a/tests/containerfiles/lbi/Containerfile b/tests/containerfiles/lbi/Containerfile
@@ -1,5 +1,5 @@
 # Build bootc from the current git into a c9s-bootc container image.
-# Use e.g. --build-arg=base=quay.io/fedora/fedora-bootc:40 to target
+# Use e.g. --build-arg=base=quay.io/fedora/fedora-bootc:41 to target
 # Fedora instead.
 #
 # You can also generate an image with cloud-init and other dependencies