namespaces: combine Process.Env and Container.Env

Signed-off-by: Andrey Vagin <avagin@openvz.org>
2014-12-18 14:59:29 +03:00 · 2014-12-18 14:59:29 +03:00 · c912207636
parent 86653c66a3
commit c912207636
1 changed files with 1 additions and 1 deletions
--- a/namespaces/exec.go
+++ b/namespaces/exec.go
@ -55,7 +55,7 @@ func Exec(args []string, env []string, command *exec.Cmd, container *configs.Con
 	}

 	process := processArgs{
-		Env:  env,
+		Env:  append(env[0:], container.Env...),
 		Args: args,
 	}
 	if err := encoder.Encode(process); err != nil {