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

Fix the attach behavior with -i

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-09-23 17:53:02 -07:00
parent f435970695
commit 537149829a
No known key found for this signature in database
GPG key ID: B33E4642CB6E3FF3
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
container.go
View file

@ -473,13 +473,11 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
utils.Debugf("[start] attach stdout\n") utils.Debugf("[start] attach stdout\n")
defer utils.Debugf("[end] attach stdout\n") defer utils.Debugf("[end] attach stdout\n")
// If we are in StdinOnce mode, then close stdin // If we are in StdinOnce mode, then close stdin
if container.Config.StdinOnce { if container.Config.StdinOnce && stdin != nil {
if stdin != nil { defer stdin.Close()
defer stdin.Close() }
} if stdinCloser != nil {
if stdinCloser != nil { defer stdinCloser.Close()
defer stdinCloser.Close()
}
} }
_, err := io.Copy(stdout, cStdout) _, err := io.Copy(stdout, cStdout)
if err != nil { if err != nil {
@ -511,13 +509,11 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
utils.Debugf("[start] attach stderr\n") utils.Debugf("[start] attach stderr\n")
defer utils.Debugf("[end] attach stderr\n") defer utils.Debugf("[end] attach stderr\n")
// If we are in StdinOnce mode, then close stdin // If we are in StdinOnce mode, then close stdin
if container.Config.StdinOnce { if container.Config.StdinOnce && stdin != nil {
if stdin != nil { defer stdin.Close()
defer stdin.Close() }
} if stdinCloser != nil {
if stdinCloser != nil { defer stdinCloser.Close()
defer stdinCloser.Close()
}
} }
_, err := io.Copy(stderr, cStderr) _, err := io.Copy(stderr, cStderr)
if err != nil { if err != nil {