Merge pull request #4989 from coreos/dependabot/cargo/ostree-ext-0.14.1

build(deps): bump ostree-ext from 0.13.4 to 0.14.1
coreos · Jun 15, 2024 · 4aa287b · 4aa287b
2 parents fec15f5 + 9eb5024
commit 4aa287b
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -51,7 +51,6 @@ camino = "1.1.7"
 cap-std-ext = "4"
 cap-primitives = "3"
 cap-std = { version = "3", features = ["fs_utf8"] }
-containers-image-proxy = { version = "0.5.8", features = ["proxy_v0_2_4"] }
 # Explicitly force on libc
 rustix = { version = "0.38", features = ["use-libc", "process", "fs"] }
 chrono = { version = "0.4.38", features = ["serde"] }
@@ -73,7 +72,7 @@ nix = { version = "0.29.0", features = ["fs", "mount", "signal", "user"] }
 openssl = "0.10.64"
 once_cell = "1.19.0"
 os-release = "0.1.0"
-ostree-ext = "0.13"
+ostree-ext = "0.14"
 paste = "1.0"
 phf = { version = "0.11", features = ["macros"] }
 rand = "0.8.5"

diff --git a/rust/src/compose.rs b/rust/src/compose.rs
@@ -12,6 +12,7 @@ use clap::Parser;
 use oci_spec::image::ImageManifest;
 use ostree::gio;
 use ostree_ext::container as ostree_container;
+use ostree_ext::containers_image_proxy;
 use ostree_ext::keyfileext::{map_keyfile_optional, KeyFileExt};
 use ostree_ext::{oci_spec, ostree};
 

diff --git a/rust/src/container.rs b/rust/src/container.rs
@@ -21,6 +21,7 @@ use fn_error_context::context;
 use ostree::glib;
 use ostree_ext::chunking::ObjectMetaSized;
 use ostree_ext::container::{Config, ExportOpts, ImageReference};
+use ostree_ext::containers_image_proxy;
 use ostree_ext::objectsource::{
     ContentID, ObjectMeta, ObjectMetaMap, ObjectMetaSet, ObjectSourceMeta,
 };