vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Move env load to nsenter

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-06-04 17:54:00 -07:00
parent 985fe60646
commit 9b830f613d
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libcontainer/namespaces/execin.go
View file

@ -14,12 +14,6 @@ import (
// ExecIn uses an existing pid and joins the pid's namespaces with the new command. // ExecIn uses an existing pid and joins the pid's namespaces with the new command.
func ExecIn(container *libcontainer.Container, nspid int, args []string) error { func ExecIn(container *libcontainer.Container, nspid int, args []string) error {
// clear the current processes env and replace it with the environment
// defined on the container
if err := LoadContainerEnvironment(container); err != nil {
return err
}
// TODO(vmarmol): If this gets too long, send it over a pipe to the child. // TODO(vmarmol): If this gets too long, send it over a pipe to the child.
// Marshall the container into JSON since it won't be available in the namespace. // Marshall the container into JSON since it won't be available in the namespace.
containerJson, err := json.Marshal(container) containerJson, err := json.Marshal(container)
@ -36,7 +30,7 @@ func ExecIn(container *libcontainer.Container, nspid int, args []string) error {
// Enter the namespace and then finish setup // Enter the namespace and then finish setup
finalArgs := []string{os.Args[0], "nsenter", strconv.Itoa(nspid), processLabel, string(containerJson)} finalArgs := []string{os.Args[0], "nsenter", strconv.Itoa(nspid), processLabel, string(containerJson)}
finalArgs = append(finalArgs, args...) finalArgs = append(finalArgs, args...)
if err := system.Execv(finalArgs[0], finalArgs[0:], container.Env); err != nil { if err := system.Execv(finalArgs[0], finalArgs[0:], os.Environ()); err != nil {
return err return err
} }
panic("unreachable") panic("unreachable")
@ -44,13 +38,18 @@ func ExecIn(container *libcontainer.Container, nspid int, args []string) error {
// NsEnter is run after entering the namespace. // NsEnter is run after entering the namespace.
func NsEnter(container *libcontainer.Container, processLabel string, nspid int, args []string) error { func NsEnter(container *libcontainer.Container, processLabel string, nspid int, args []string) error {
// clear the current processes env and replace it with the environment
// defined on the container
if err := LoadContainerEnvironment(container); err != nil {
return err
}
if err := FinalizeNamespace(container); err != nil { if err := FinalizeNamespace(container); err != nil {
return err return err
} }
if err := label.SetProcessLabel(processLabel); err != nil { if err := label.SetProcessLabel(processLabel); err != nil {
return err return err
} }
if err := system.Execv(args[0], args[0:], os.Environ()); err != nil { if err := system.Execv(args[0], args[0:], container.Env); err != nil {
return err return err
} }
panic("unreachable") panic("unreachable")