kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #19907 from tiborvass/tty-debug

Browse source 
Prevent stdin from hanging
This commit is contained in:
Tibor Vass 2016-02-01 21:57:32 -05:00
commit ec6bfebc0f
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