Add stderr log ouput if in debug
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
parent
7698e6bbc8
commit
6e979d36f4
|
@ -1,7 +1,6 @@
|
|||
package nsinit
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/dotcloud/docker/pkg/libcontainer"
|
||||
"github.com/dotcloud/docker/pkg/system"
|
||||
"os"
|
||||
|
@ -26,7 +25,7 @@ func (c *DefaultCommandFactory) Create(container *libcontainer.Container, consol
|
|||
// get our binary name from arg0 so we can always reexec ourself
|
||||
command := exec.Command(os.Args[0], append([]string{
|
||||
"-console", console,
|
||||
"-pipe", fmt.Sprint(pipe.Fd()),
|
||||
"-pipe", "3",
|
||||
"-root", c.Root,
|
||||
"init"}, args...)...)
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@ func (ns *linuxNs) Exec(container *libcontainer.Container, term Terminal, args [
|
|||
if err != nil {
|
||||
return -1, err
|
||||
}
|
||||
ns.logger.Printf("created sync pipe parent fd %d child fd %d\n", syncPipe.parent.Fd(), syncPipe.child.Fd())
|
||||
|
||||
if container.Tty {
|
||||
ns.logger.Println("creating master and console")
|
||||
|
|
|
@ -24,6 +24,7 @@ func (ns *linuxNs) Init(container *libcontainer.Container, uncleanRootfs, consol
|
|||
}
|
||||
|
||||
// We always read this as it is a way to sync with the parent as well
|
||||
ns.logger.Printf("reading from sync pipe fd %d\n", syncPipe.child.Fd())
|
||||
context, err := syncPipe.ReadFromParent()
|
||||
if err != nil {
|
||||
syncPipe.Close()
|
||||
|
@ -68,7 +69,7 @@ func (ns *linuxNs) Init(container *libcontainer.Container, uncleanRootfs, consol
|
|||
}
|
||||
|
||||
if profile := container.Context["apparmor_profile"]; profile != "" {
|
||||
ns.logger.Printf("setting apparmor prifile %s\n", profile)
|
||||
ns.logger.Printf("setting apparmor profile %s\n", profile)
|
||||
if err := apparmor.ApplyProfile(os.Getpid(), profile); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue