mirror/ youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-05-04 22:56:15 +02:00
Code Issues

Merge pull request #1106 from Furisto/procfs-0.14.0 

Bump procfs from 0.13.2 to 0.14.0
This commit is contained in:
utam0k 2022-08-09 19:13:18 +09:00 committed by GitHub
parent f02f5c2b5c e3fcdafc92
commit 36d9df68e9
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/libcgroups/Cargo.toml
View File

@ -21,7 +21,7 @@ cgroupsv2_devices = ["rbpf", "libbpf-sys", "errno", "libc"]
[dependencies]
nix = "0.24.2"
procfs = "0.13.2"
procfs = "0.14.0"
log = "0.4"
anyhow = "1.0"
oci-spec = { version = "0.5.7", features = ["runtime"] }

2
crates/libcontainer/Cargo.toml
View File

@ -30,7 +30,7 @@ mio = { version = "0.8.4", features = ["os-ext", "os-poll"] }
nix = "0.24.2"
oci-spec = { version = "0.5.7", features = ["runtime"] }
path-clean = "0.1.0"
procfs = "0.13.2"
procfs = "0.14.0"
prctl = "1.0.0"
libcgroups = { version = "0.0.3", path = "../libcgroups" }
libseccomp = { version = "0.2.3" }

8
crates/libcontainer/src/container/tenant_builder.rs
View File

@ -11,6 +11,7 @@ use procfs::process::Namespace;
use std::{
collections::HashMap,
convert::TryFrom,
ffi::{OsStr, OsString},
fs,
os::unix::prelude::RawFd,
path::{Path, PathBuf},
@ -321,11 +322,14 @@ impl<'a> TenantContainerBuilder<'a> {
Ok(None)
}
fn get_namespaces(&self, init_namespaces: Vec<Namespace>) -> Result<Vec<LinuxNamespace>> {
fn get_namespaces(
&self,
init_namespaces: HashMap<OsString, Namespace>,
) -> Result<Vec<LinuxNamespace>> {
let mut tenant_namespaces = Vec::with_capacity(init_namespaces.len());
for &ns_type in NAMESPACE_TYPES {
if let Some(init_ns) = init_namespaces.iter().find(|n| n.ns_type == ns_type) {
if let Some(init_ns) = init_namespaces.get(OsStr::new(ns_type)) {
let tenant_ns = LinuxNamespaceType::try_from(ns_type)?;
tenant_namespaces.push(
LinuxNamespaceBuilder::default()

2
crates/libcontainer/src/tty.rs
View File

@ -98,7 +98,7 @@ mod tests {
fn setup(testname: &str) -> Result<(TempDir, PathBuf, PathBuf)> {
let testdir = create_temp_dir(testname)?;
let rundir_path = Path::join(&testdir, "run");
let _ = fs::create_dir(&rundir_path)?;
fs::create_dir(&rundir_path)?;
let socket_path = Path::new(&rundir_path).join("socket");
let _ = File::create(&socket_path);
env::set_current_dir(&testdir)?;

2
crates/youki/Cargo.toml
View File

@ -27,7 +27,7 @@ nix = "0.24.2"
oci-spec = { version = "0.5.7", features = ["runtime"] }
once_cell = "1.13.0"
pentacle = "1.0.0"
procfs = "0.13.2"
procfs = "0.14.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tabwriter = "1"

2
tests/rust-integration-tests/integration_test/Cargo.toml
View File

@ -15,7 +15,7 @@ num_cpus = "1.13"
oci-spec = "0.5.7"
once_cell = "1.13.0"
pnet_datalink = "0.31.0"
procfs = "0.13.2"
procfs = "0.14.0"
rand = "0.8.5"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"