Merge pull request #923 from utam0k/limit-runtime

put the runtime feature into the oci-spec-rs crate.
youki-dev · May 16, 2022 · 56b1701 · 56b1701
2 parents 5b23ca5 + a55cbd0
commit 56b1701
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/crates/libcgroups/Cargo.toml b/crates/libcgroups/Cargo.toml
@@ -25,7 +25,7 @@ nix = "0.24.1"
 procfs = "0.12.0"
 log = "0.4"
 anyhow = "1.0"
-oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
+oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e", features = ["runtime"] }
 dbus = { version = "0.9.5", optional = true }
 fixedbitset = "0.4.1"
 serde = { version = "1.0", features = ["derive"] }
@@ -35,7 +35,7 @@ errno = { version = "0.2.8", optional = true }
 libc = { version = "0.2.125", optional = true }
 
 [dev-dependencies]
-oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e", features = ["proptests"] }
+oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e", features = ["proptests", "runtime"] }
 quickcheck = "1"
 mockall = { version = "0.11.1", features = [] }
 clap = "3.1.18"

diff --git a/crates/libcontainer/Cargo.toml b/crates/libcontainer/Cargo.toml
@@ -29,7 +29,7 @@ libc = "0.2.125"
 log = "0.4"
 mio = { version = "0.8.3", features = ["os-ext", "os-poll"] }
 nix = "0.24.1"
-oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
+oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e", features = ["runtime"] }
 path-clean = "0.1.0"
 procfs = "0.12.0"
 prctl = "1.0.0"
@@ -43,7 +43,7 @@ wasmer = { version = "2.2.0", optional = true }
 wasmer-wasi = { version = "2.2.0", optional = true }
 
 [dev-dependencies]
-oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e", features = ["proptests"] }
+oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e", features = ["proptests", "runtime"] }
 quickcheck = "1"
 serial_test = "0.6.0"
 rand = "0.8.5"
diff --git a/crates/youki/Cargo.toml b/crates/youki/Cargo.toml
@@ -25,7 +25,7 @@ libcontainer = { version = "0.0.3", path = "../libcontainer" }
 liboci-cli = { version = "0.0.3", path = "../liboci-cli" }
 log = { version = "0.4", features = ["std"]}
 nix = "0.24.1"
-oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
+oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" , features = ["runtime"] }
 once_cell = "1.10.0"
 pentacle = "1.0.0"
 procfs = "0.12.0"

diff --git a/tests/rust-integration-tests/runtimetest/Cargo.toml b/tests/rust-integration-tests/runtimetest/Cargo.toml
@@ -4,5 +4,5 @@ version = "0.0.1"
 edition = "2021"
 
 [dependencies]
-oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
+oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e", features = ["runtime"] }
 nix = "0.24.1"