mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-09-19 15:58:25 +00:00
Merge pull request #9246 from microsoft/danmihai/default-env
genpolicy: default env if image doesn't have env
This commit is contained in:
@@ -550,10 +550,9 @@ allow_env(p_process, i_process, s_name) {
|
|||||||
print("allow_env: p env =", p_process.Env)
|
print("allow_env: p env =", p_process.Env)
|
||||||
print("allow_env: i env =", i_process.Env)
|
print("allow_env: i env =", i_process.Env)
|
||||||
|
|
||||||
# TODO: re-enable after fixing https://github.com/kata-containers/kata-containers/issues/9239.
|
every i_var in i_process.Env {
|
||||||
# every i_var in i_process.Env {
|
allow_var(p_process, i_process, i_var, s_name)
|
||||||
# allow_var(p_process, i_process, i_var, s_name)
|
}
|
||||||
# }
|
|
||||||
|
|
||||||
print("allow_env: true")
|
print("allow_env: true")
|
||||||
}
|
}
|
||||||
|
@@ -161,3 +161,10 @@ pub fn get_linux(privileged_container: bool) -> policy::KataLinux {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_default_unix_env(env: &mut Vec<String>) {
|
||||||
|
assert!(env.is_empty());
|
||||||
|
|
||||||
|
// Return the value of defaultUnixEnv from containerd.
|
||||||
|
env.push("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin".to_string());
|
||||||
|
}
|
||||||
|
@@ -6,6 +6,7 @@
|
|||||||
// Allow Docker image config field names.
|
// Allow Docker image config field names.
|
||||||
#![allow(non_snake_case)]
|
#![allow(non_snake_case)]
|
||||||
|
|
||||||
|
use crate::containerd;
|
||||||
use crate::policy;
|
use crate::policy;
|
||||||
use crate::verity;
|
use crate::verity;
|
||||||
|
|
||||||
@@ -159,10 +160,13 @@ impl Container {
|
|||||||
process.Terminal = false;
|
process.Terminal = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
assert!(process.Env.is_empty());
|
||||||
if let Some(config_env) = &docker_config.Env {
|
if let Some(config_env) = &docker_config.Env {
|
||||||
for env in config_env {
|
for env in config_env {
|
||||||
process.Env.push(env.clone());
|
process.Env.push(env.clone());
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
containerd::get_default_unix_env(&mut process.Env);
|
||||||
}
|
}
|
||||||
|
|
||||||
let policy_args = &mut process.Args;
|
let policy_args = &mut process.Args;
|
||||||
|
Reference in New Issue
Block a user