Merge branch 'main' into dependabot/cargo/path-clean-1.0.1

youki-dev · Feb 27, 2023 · 33c094d · 33c094d
2 parents 115c41c + 7b7a782
commit 33c094d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 76 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/libcgroups/Cargo.toml b/crates/libcgroups/Cargo.toml
@@ -24,7 +24,7 @@ nix = "0.26.2"
 procfs = "0.15.1"
 log = "0.4"
 anyhow = "1.0"
-oci-spec = { version = "^0.5.5", features = ["runtime"] }
+oci-spec = { version = "^0.6.0", features = ["runtime"] }
 dbus = { version = "0.9.7", optional = true }
 fixedbitset = "0.4.2"
 serde = { version = "1.0", features = ["derive"] }
@@ -34,7 +34,7 @@ errno = { version = "0.3.0", optional = true }
 libc = { version = "0.2.139", optional = true }
 
 [dev-dependencies]
-oci-spec = { version = "^0.5.5", features = ["proptests", "runtime"] }
+oci-spec = { version = "^0.6.0", features = ["proptests", "runtime"] }
 quickcheck = "1"
 mockall = { version = "0.11.3", features = [] }
 clap = "4.0.32"

diff --git a/crates/libcontainer/Cargo.toml b/crates/libcontainer/Cargo.toml
@@ -33,8 +33,8 @@ libc = "0.2.139"
 log = "0.4"
 mio = { version = "0.8.6", features = ["os-ext", "os-poll"] }
 nix = "0.26.2"
-oci-spec = { version = "^0.5.5", features = ["runtime"] }
 path-clean = "1.0.1"
+oci-spec = { version = "^0.6.0", features = ["runtime"] }
 procfs = "0.15.1"
 prctl = "1.0.0"
 libcgroups = { version = "0.0.4", path = "../libcgroups", default-features = false }
@@ -50,7 +50,7 @@ wasmtime = {version = "6.0.0", optional = true }
 wasmtime-wasi = {version = "6.0.0", optional = true }
 
 [dev-dependencies]
-oci-spec = { version = "^0.5.5", features = ["proptests", "runtime"] }
+oci-spec = { version = "^0.6.0", features = ["proptests", "runtime"] }
 quickcheck = "1"
 serial_test = "1.0.0"
 rand = "0.8.5"
diff --git a/crates/youki/Cargo.toml b/crates/youki/Cargo.toml
@@ -33,7 +33,7 @@ libcontainer = { version = "0.0.4", path = "../libcontainer", default-features =
 liboci-cli = { version = "0.0.4", path = "../liboci-cli" }
 log = { version = "0.4", features = ["std"] }
 nix = "0.26.2"
-oci-spec = { version = "^0.5.5", features = ["runtime"] }
+oci-spec = { version = "^0.6.0", features = ["runtime"] }
 once_cell = "1.17.1"
 pentacle = "1.0.0"
 procfs = "0.15.1"