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 #1995 from dotcloud/fix_attach_2

Browse source 
Fix the attach behavior with -i
This commit is contained in:
Victor Vieux 2013-09-30 03:29:19 -07:00
commit bcce3cbdd1
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

@ -478,13 +478,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 {
@ -516,13 +514,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 {