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

Handle non-tty mode

Browse source 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
This commit is contained in:
Guillaume J. Charmes 2014-02-20 18:05:40 -08:00 • committed by Michael Crosby
parent 41696722fa
commit 97738ffed3
4 changed files with 70 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

55
libcontainer/nsinit/exec.go
View file

@ -16,10 +16,21 @@ import (
"syscall"
)
func execCommand(container *libcontainer.Container, args []string) (int, error) {
master, console, err := createMasterAndConsole()
if err != nil {
return -1, err
func execCommand(container *libcontainer.Container, tty bool, args []string) (int, error) {
var (
master *os.File
console string
err error
inPipe io.WriteCloser
outPipe, errPipe io.ReadCloser
)
if tty {
master, console, err = createMasterAndConsole()
if err != nil {
return -1, err
}
}
// create a pipe so that we can syncronize with the namespaced process and
@ -32,6 +43,21 @@ func execCommand(container *libcontainer.Container, args []string) (int, error)
command := createCommand(container, console, r.Fd(), args)
if !tty {
inPipe, err = command.StdinPipe()
if err != nil {
return -1, err
}
outPipe, err = command.StdoutPipe()
if err != nil {
return -1, err
}
errPipe, err = command.StderrPipe()
if err != nil {
return -1, err
}
}
if err := command.Start(); err != nil {
return -1, err
}
@ -63,15 +89,20 @@ func execCommand(container *libcontainer.Container, args []string) (int, error)
w.Close()
r.Close()
go io.Copy(os.Stdout, master)
go io.Copy(master, os.Stdin)
state, err := setupWindow(master)
if err != nil {
command.Process.Kill()
return -1, err
if tty {
go io.Copy(os.Stdout, master)
go io.Copy(master, os.Stdin)
state, err := setupWindow(master)
if err != nil {
command.Process.Kill()
return -1, err
}
defer term.RestoreTerminal(os.Stdin.Fd(), state)
} else {
go io.Copy(inPipe, os.Stdin)
go io.Copy(os.Stdout, outPipe)
go io.Copy(os.Stderr, errPipe)
}
defer term.RestoreTerminal(os.Stdin.Fd(), state)
if err := command.Wait(); err != nil {
if _, ok := err.(*exec.ExitError); !ok {