Merge pull request #1377 from cgwalters/bumps

Bump to newer ocidir and containers-image-proxy

Author: cgwalters

Cargo.lock

@@ -9,10 +9,7 @@ repository = "https://github.com/ostreedev/ostree-rs-ext"
 version = "0.15.3"
 
 [dependencies]
-# Note that we re-export the oci-spec types
-# that are exported by this crate, so when bumping
-# semver here you must also bump our semver.
-containers-image-proxy = "0.7.0"
+containers-image-proxy = "0.8.0"
 # We re-export this library too.
 ostree = { features = ["v2025_2"], version = "0.20" }
 
@@ -22,7 +19,6 @@ bootc-utils = { path = "../utils" }
 camino = { workspace = true, features = ["serde1"] }
 composefs = { git = "https://github.com/containers/composefs-rs", rev = "821eeae93e48f1ee381c49b8cd4d22fda92d27a2" }
 chrono = { workspace = true }
-olpc-cjson = "0.1.1"
 clap = { workspace = true, features = ["derive","cargo"] }
 clap_mangen = { workspace = true, optional = true }
 comfy-table = "7.1.1"
@@ -37,7 +33,7 @@ indicatif = { workspace = true }
 libc = { workspace = true }
 libsystemd = "0.7.0"
 openssl = { workspace = true }
-ocidir = "0.3.0"
+ocidir = "0.4.0"
 pin-project = "1.0"
 regex = "1.5.4"
 rustix = { workspace = true, features = ["fs", "process"] }

ostree-ext/Cargo.toml

@@ -236,7 +236,7 @@ fn build_oci(
         &mut labels,
     )?;
 
-    let mut manifest = ocidir::new_empty_manifest().build().unwrap();
+    let mut manifest = writer.new_empty_manifest()?.build().unwrap();
 
     let chunking = opts
         .contentmeta
@@ -355,15 +355,15 @@ async fn build_impl(
         }
         let ocidir = Dir::open_ambient_dir(path, cap_std::ambient_authority())
             .with_context(|| format!("Opening {path}"))?;
-        let mut ocidir = OciDir::ensure(&ocidir).context("Opening OCI")?;
+        let mut ocidir = OciDir::ensure(ocidir).context("Opening OCI")?;
         build_oci(repo, ostree_ref, &mut ocidir, tag, config, opts)?;
         None
     } else {
         let tempdir = {
             let vartmp = Dir::open_ambient_dir("/var/tmp", cap_std::ambient_authority())?;
             cap_std_ext::cap_tempfile::tempdir_in(&vartmp)?
         };
-        let mut ocidir = OciDir::ensure(&tempdir)?;
+        let mut ocidir = OciDir::ensure(tempdir.try_clone()?)?;
 
         // Minor TODO: refactor to avoid clone
         let authfile = opts.authfile.clone();

ostree-ext/src/container/encapsulate.rs

@@ -1435,7 +1435,7 @@ pub(crate) fn export_to_oci(
     new_config.history_mut().clear();
     new_config.rootfs_mut().diff_ids_mut().clear();
 
-    let mut dest_oci = ocidir::OciDir::ensure(dest_oci)?;
+    let mut dest_oci = ocidir::OciDir::ensure(dest_oci.try_clone()?)?;
 
     let opts = ExportOpts {
         skip_compression: opts.skip_compression,

ostree-ext/src/container/store.rs

@@ -41,12 +41,10 @@ pub async fn update_detached_metadata(
         // Open the temporary OCI directory.
         let tempsrc = Dir::open_ambient_dir(tempsrc_ref_path, cap_std::ambient_authority())
             .context("Opening src")?;
-        let tempsrc = ocidir::OciDir::open(&tempsrc)?;
+        let tempsrc = ocidir::OciDir::open(tempsrc)?;
 
         // Load the manifest, platform, and config
-        let idx = tempsrc
-            .read_index()?
-            .ok_or(anyhow!("Reading image index from source"))?;
+        let idx = tempsrc.read_index()?;
         let manifest_descriptor = idx
             .manifests()
             .first()

ostree-ext/src/container/update_detachedmeta.rs

@@ -973,7 +973,7 @@ impl NonOstreeFixture {
         // Create the src/ directory
         dir.create_dir_all(Self::SRCOCI)?;
         let src_oci = dir.open_dir(Self::SRCOCI)?;
-        let src_oci = ocidir::OciDir::ensure(&src_oci)?;
+        let src_oci = ocidir::OciDir::ensure(src_oci)?;
 
         dir.create_dir("dest")?;
         let destrepo = ostree::Repo::create_at_dir(
@@ -1004,7 +1004,7 @@ impl NonOstreeFixture {
         };
 
         let mut config = ImageConfigurationBuilder::default().build().unwrap();
-        let mut manifest = ocidir::new_empty_manifest().build().unwrap();
+        let mut manifest = self.src_oci.new_empty_manifest()?.build().unwrap();
 
         let bw = self.src_oci.create_gzip_layer(None)?;
         let mut bw = tar::Builder::new(bw);
@@ -1034,7 +1034,7 @@ impl NonOstreeFixture {
         manifest.set_config(config);
         self.src_oci
             .replace_with_single_manifest(manifest, oci_image::Platform::default())?;
-        let idx = self.src_oci.read_index()?.unwrap();
+        let idx = self.src_oci.read_index()?;
         let descriptor = idx.manifests().first().unwrap();
 
         Ok((imgref, descriptor.digest().to_owned()))