toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix stale command with stdout is not allocated

Browse Source 
Upstream-commit: 0ca88443985e7a944106ed4ceaf877a97f1ca2ec
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-06-03 17:39:29 -07:00
parent b65061b897
commit 6f2fd272da
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/engine/container.go
View File

@ -355,6 +355,17 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
errors <- err
}()
}
} else {
go func() {
defer stdinCloser.Close()
cStdout, err := container.StdoutPipe()
if err != nil {
utils.Debugf("Error stdout pipe")
return
}
io.Copy(&utils.NopWriter{}, cStdout)
}()
}
if stderr != nil {
nJobs += 1
@ -381,7 +392,19 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
errors <- err
}()
}
} else {
go func() {
defer stdinCloser.Close()
cStderr, err := container.StdoutPipe()
if err != nil {
utils.Debugf("Error stdout pipe")
return
}
io.Copy(&utils.NopWriter{}, cStderr)
}()
}
return utils.Go(func() error {
if cStdout != nil {
defer cStdout.Close()