Skip to content

Commit

Permalink
Merge pull request #1486 from containers/dependabot/cargo/nix-0.26.2
Browse files Browse the repository at this point in the history
chore(deps): bump nix from 0.25.0 to 0.26.2
  • Loading branch information
YJDoc2 committed Feb 14, 2023
2 parents 83dfa42 + 38e763a commit 0730dba
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 10 deletions.
14 changes: 10 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/libcgroups/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ systemd = ["v2", "dep:dbus"]
cgroupsv2_devices = ["rbpf", "libbpf-sys", "errno", "libc"]

[dependencies]
nix = "0.25.0"
nix = "0.26.2"
procfs = "0.14.2"
log = "0.4"
anyhow = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/libcontainer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ futures = { version = "0.3", features = ["thread-pool"] }
libc = "0.2.139"
log = "0.4"
mio = { version = "0.8.5", features = ["os-ext", "os-poll"] }
nix = "0.25.0"
nix = "0.26.2"
oci-spec = { version = "^0.5.5", features = ["runtime"] }
path-clean = "0.1.0"
procfs = "0.14.2"
Expand Down
2 changes: 1 addition & 1 deletion crates/youki/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ libcgroups = { version = "0.0.4", path = "../libcgroups", default-features = fal
libcontainer = { version = "0.0.4", path = "../libcontainer", default-features = false }
liboci-cli = { version = "0.0.4", path = "../liboci-cli" }
log = { version = "0.4", features = ["std"] }
nix = "0.25.0"
nix = "0.26.2"
oci-spec = { version = "^0.5.5", features = ["runtime"] }
once_cell = "1.17.0"
pentacle = "1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/rust-integration-tests/integration_test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ flate2 = "1.0"
libcgroups = { path = "../../../crates/libcgroups" }
libcontainer = { path = "../../../crates/libcontainer" }
log = { version = "0.4", features = ["std"] }
nix = "0.25.0"
nix = "0.26.2"
num_cpus = "1.15"
oci-spec = "0.6.0"
once_cell = "1.17.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,9 @@ pub fn recv_seccomp_listener(seccomp_listener: &Path) -> SeccompAgentResult {
if msg.bytes >= DEFAULT_BUFFER_SIZE {
bail!("received more than the DEFAULT_BUFFER_SIZE");
}
let msg_bytes = msg.bytes;

buf.truncate(msg.bytes);
buf.truncate(msg_bytes);

let container_process_state: libcontainer::container::ContainerProcessState =
serde_json::from_slice(&buf[..])
Expand Down
2 changes: 1 addition & 1 deletion tests/rust-integration-tests/runtimetest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"

[dependencies]
oci-spec = { version = "0.6.0", features = ["runtime"] }
nix = "0.25.0"
nix = "0.26.2"
anyhow = "1.0"

0 comments on commit 0730dba

Please sign in to comment.