mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
fix docker run -a stderr
This commit is contained in:
parent
f95621fd05
commit
3ba279a370
1 changed files with 2 additions and 2 deletions
|
@ -2361,7 +2361,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
|
||||||
defer term.RestoreTerminal(cli.terminalFd, oldState)
|
defer term.RestoreTerminal(cli.terminalFd, oldState)
|
||||||
}
|
}
|
||||||
|
|
||||||
if stdout != nil {
|
if stdout != nil || stderr != nil {
|
||||||
receiveStdout = utils.Go(func() (err error) {
|
receiveStdout = utils.Go(func() (err error) {
|
||||||
defer func() {
|
defer func() {
|
||||||
if in != nil {
|
if in != nil {
|
||||||
|
@ -2401,7 +2401,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
|
||||||
if stdout != nil {
|
if stdout != nil || stderr != nil {
|
||||||
if err := <-receiveStdout; err != nil {
|
if err := <-receiveStdout; err != nil {
|
||||||
utils.Errorf("Error receiveStdout: %s", err)
|
utils.Errorf("Error receiveStdout: %s", err)
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Add table
Reference in a new issue