containerd
/
rust-extensions
mirror of https://github.com/containerd/rust-extensions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shim: pass environment variables to spawned process 

Enhanace spawn() to pass envrionment variables to child process.

Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>
This commit is contained in:
Liu Jiang 2021-12-12 22:36:22 +08:00
parent 1b106ee38d
commit 04af4df73a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/shim/examples/empty_shim.rs
View File

@ -37,7 +37,7 @@ impl shim::Shim for Service {
} }
fn start_shim(&mut self, opts: shim::StartOpts) -> Result<String, shim::Error> { fn start_shim(&mut self, opts: shim::StartOpts) -> Result<String, shim::Error> {
let address = shim::spawn(opts)?; let address = shim::spawn(opts, Vec::new())?;
Ok(address) Ok(address)
} }
} }

5
crates/shim/src/lib.rs
View File

@ -316,7 +316,7 @@ fn start_listener(address: &str) -> Result<UnixListener, Error> {
/// Spawn is a helper func to launch shim process. /// Spawn is a helper func to launch shim process.
/// Typically this expected to be called from `StartShim`. /// Typically this expected to be called from `StartShim`.
pub fn spawn(opts: StartOpts) -> Result<String, Error> { pub fn spawn(opts: StartOpts, vars: Vec<(&str, &str)>) -> Result<String, Error> {
let cmd = env::current_exe()?; let cmd = env::current_exe()?;
let cwd = env::current_dir()?; let cwd = env::current_dir()?;
let address = socket_address(&opts.address, &opts.namespace, &opts.id); let address = socket_address(&opts.address, &opts.namespace, &opts.id);
@ -342,7 +342,8 @@ pub fn spawn(opts: StartOpts) -> Result<String, Error> {
&opts.id, &opts.id,
"-address", "-address",
&opts.address, &opts.address,
]); ])
.envs(vars);
command.spawn().map_err(Into::into).map(|_| { command.spawn().map_err(Into::into).map(|_| {
// Ownership of `listener` has been passed to child. // Ownership of `listener` has been passed to child.