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

Merge pull request #3058 from dotcloud/add_stderr_hijack

Browse Source 
fix docker run -a stderr
Upstream-commit: afbea3f13ffde3bdef33e05c735c3172715732d5
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-12-04 17:16:56 -08:00
parent 86c79e6a69 e215a324cf
commit 4b1e431156
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/commands.go
View File

@ -2361,7 +2361,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
defer term.RestoreTerminal(cli.terminalFd, oldState)
}
if stdout != nil {
if stdout != nil || stderr != nil {
receiveStdout = utils.Go(func() (err error) {
defer func() {
if in != nil {
@ -2401,7 +2401,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
return nil
})
if stdout != nil {
if stdout != nil || stderr != nil {
if err := <-receiveStdout; err != nil {
utils.Errorf("Error receiveStdout: %s", err)
return err