Merge pull request #9243 from microsoft/danmihai1/genpolicy-unblock-ci

genpolicy: disable env variable verification
This commit is contained in:
Dan Mihai
2024-03-06 21:44:18 -08:00
committed by GitHub
2 changed files with 9 additions and 6 deletions

View File

@@ -550,9 +550,10 @@ allow_env(p_process, i_process, s_name) {
print("allow_env: p env =", p_process.Env)
print("allow_env: i env =", i_process.Env)
every i_var in i_process.Env {
allow_var(p_process, i_process, i_var, s_name)
}
# TODO: re-enable after fixing https://github.com/kata-containers/kata-containers/issues/9239.
# every i_var in i_process.Env {
# allow_var(p_process, i_process, i_var, s_name)
# }
print("allow_env: true")
}

View File

@@ -41,7 +41,7 @@ struct DockerConfigLayer {
struct DockerImageConfig {
User: Option<String>,
Tty: Option<bool>,
Env: Vec<String>,
Env: Option<Vec<String>>,
Cmd: Option<Vec<String>>,
WorkingDir: Option<String>,
Entrypoint: Option<Vec<String>>,
@@ -159,8 +159,10 @@ impl Container {
process.Terminal = false;
}
for env in &docker_config.Env {
process.Env.push(env.clone());
if let Some(config_env) = &docker_config.Env {
for env in config_env {
process.Env.push(env.clone());
}
}
let policy_args = &mut process.Args;