0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Skip Close()-ing stdin on Darwin. The Return.

Browse source 
This was accidentally removed in https://github.com/docker/docker/pull/16289
Now adding it back.

Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass 2016-02-01 20:28:40 -05:00
parent b2c04e941b
commit 6da35a288f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/client/cli.go
View file

@ -96,7 +96,11 @@ func (cli *DockerCli) restoreTerminal(in io.Closer) error {
if cli.state != nil { if cli.state != nil {
term.RestoreTerminal(cli.inFd, cli.state) term.RestoreTerminal(cli.inFd, cli.state)
} }
if in != nil { // WARNING: DO NOT REMOVE THE OS CHECK !!!
// For some reason this Close call blocks on darwin..
// As the client exists right after, simply discard the close
// until we find a better solution.
if in != nil && runtime.GOOS != "darwin" {
return in.Close() return in.Close()
} }
return nil return nil