diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-07-17 18:34:39 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-07-17 18:34:39 +0200 |
| commit | 021b7d06acc6b54e9da4719f8e98970b0548b583 (patch) | |
| tree | cc772fce7c916570339eb88164740723753f60f9 /src/runner/runc/spec.rs | |
| parent | 254e3448c581344e0b688b847520ff198f60f58b (diff) | |
| download | rebel-021b7d06acc6b54e9da4719f8e98970b0548b583.tar rebel-021b7d06acc6b54e9da4719f8e98970b0548b583.zip | |
Pass environment from executor, add to input hash
Diffstat (limited to 'src/runner/runc/spec.rs')
| -rw-r--r-- | src/runner/runc/spec.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/runner/runc/spec.rs b/src/runner/runc/spec.rs index bc226cb..5cfdfa2 100644 --- a/src/runner/runc/spec.rs +++ b/src/runner/runc/spec.rs @@ -1,10 +1,13 @@ +use std::collections::HashMap; + use oci_spec::runtime; use serde::Deserialize; use serde_json::json; use crate::unshare; -pub fn generate_spec(run: &str) -> runtime::Spec { +pub fn generate_spec(run: &str, env: &HashMap<String, String>) -> runtime::Spec { + let env_entries: Vec<String> = env.iter().map(|(k, v)| format!("{}={}", k, v)).collect(); runtime::Spec::deserialize(json!({ "ociVersion": "1.0.2", "process": { @@ -18,10 +21,7 @@ pub fn generate_spec(run: &str) -> runtime::Spec { "-ec", run ], - "env": [ - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", - "TERM=xterm" - ], + "env": env_entries, "cwd": "/home/build", "noNewPrivileges": true }, |