mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #19907 from tiborvass/tty-debug
Prevent stdin from hanging
This commit is contained in:
commit
ec6bfebc0f
1 changed files with 5 additions and 1 deletions
|
@ -96,7 +96,11 @@ func (cli *DockerCli) restoreTerminal(in io.Closer) error {
|
|||
if cli.state != nil {
|
||||
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 nil
|
||||
|
|
Loading…
Add table
Reference in a new issue