From 172260a49be6c3516edc6869d58957e844f9c69b Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Sat, 22 Feb 2014 01:28:59 -0800 Subject: [PATCH] Fix tty copy for driver Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- execdriver/namespaces/driver.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/execdriver/namespaces/driver.go b/execdriver/namespaces/driver.go index a3f095f464..efbb09d131 100644 --- a/execdriver/namespaces/driver.go +++ b/execdriver/namespaces/driver.go @@ -8,6 +8,7 @@ import ( "github.com/dotcloud/docker/execdriver/lxc" "github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer/nsinit" + "io" "io/ioutil" "os" "os/exec" @@ -203,7 +204,11 @@ type dockerTtyTerm struct { } func (t *dockerTtyTerm) Attach(cmd *exec.Cmd) error { - return t.AttachPipes(cmd, t.pipes) + go io.Copy(t.pipes.Stdout, t.MasterPty) + if t.pipes.Stdin != nil { + go io.Copy(t.MasterPty, t.pipes.Stdin) + } + return nil } func (t *dockerTtyTerm) SetMaster(master *os.File) {