|
|
@ -7,7 +7,7 @@ use path::{Path, PathBuf};
|
|
|
|
|
|
|
|
|
|
|
|
use nix::sched::{clone, CloneCb, CloneFlags, setns};
|
|
|
|
use nix::sched::{clone, CloneCb, CloneFlags, setns};
|
|
|
|
use nix::sys::{signal::{kill, Signal}, wait::{waitpid, WaitPidFlag}};
|
|
|
|
use nix::sys::{signal::{kill, Signal}, wait::{waitpid, WaitPidFlag}};
|
|
|
|
use nix::unistd::{dup2, pivot_root, setuid, setgid, Gid, Pid, Uid, User, setgroups};
|
|
|
|
use nix::unistd::{dup2, pivot_root, setgid, setgroups, sethostname, setuid, Gid, Pid, Uid, User};
|
|
|
|
use nix::mount::{mount, MntFlags, MsFlags, umount2};
|
|
|
|
use nix::mount::{mount, MntFlags, MsFlags, umount2};
|
|
|
|
use uuid;
|
|
|
|
use uuid;
|
|
|
|
use toml;
|
|
|
|
use toml;
|
|
|
@ -392,6 +392,7 @@ fn run_container(_container_id: &String, cmd: &String, args: &RockerArgs, volume
|
|
|
|
if let Some(custom_volume) = &args.volume {
|
|
|
|
if let Some(custom_volume) = &args.volume {
|
|
|
|
init_container_custom_volume(&container_merged_path, custom_volume).unwrap();
|
|
|
|
init_container_custom_volume(&container_merged_path, custom_volume).unwrap();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sethostname(USER_NAME).unwrap();
|
|
|
|
init_container_env(args.env.as_ref()).unwrap();
|
|
|
|
init_container_env(args.env.as_ref()).unwrap();
|
|
|
|
init_container_pivot(&container_merged_path).unwrap();
|
|
|
|
init_container_pivot(&container_merged_path).unwrap();
|
|
|
|
init_container_mount().unwrap();
|
|
|
|
init_container_mount().unwrap();
|
|
|
|