fix docker run -a stderr
Upstream-commit: 3ba279a3705b3417fea36e8d2eb7d54e95d60fad Component: engine
This commit is contained in:
@ -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
|
||||
|
||||
Reference in New Issue
Block a user