From 9c05b1049fe3b3d56c6d20cb1eefafb20be8f952 Mon Sep 17 00:00:00 2001 From: Jim Minter Date: Wed, 15 Mar 2017 09:36:44 +0000 Subject: [PATCH] Resolve connection reset by peer regression Signed-off-by: Jim Minter (cherry picked from commit dc0ee98805c1e9282c729a79cdf10e59bad3cb09) Signed-off-by: Victor Vieux --- daemon/attach.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/daemon/attach.go b/daemon/attach.go index e262ed2912..fb213132f8 100644 --- a/daemon/attach.go +++ b/daemon/attach.go @@ -36,7 +36,7 @@ func (daemon *Daemon) ContainerAttach(prefixOrName string, c *backend.ContainerA } cfg := stream.AttachConfig{ - UseStdin: c.UseStdin && container.Config.OpenStdin, + UseStdin: c.UseStdin, UseStdout: c.UseStdout, UseStderr: c.UseStderr, TTY: container.Config.Tty, @@ -79,7 +79,7 @@ func (daemon *Daemon) ContainerAttachRaw(prefixOrName string, stdin io.ReadClose return err } cfg := stream.AttachConfig{ - UseStdin: stdin != nil && container.Config.OpenStdin, + UseStdin: stdin != nil, UseStdout: stdout != nil, UseStderr: stderr != nil, TTY: container.Config.Tty, @@ -147,6 +147,10 @@ func (daemon *Daemon) containerAttach(c *container.Container, cfg *stream.Attach cfg.Stdin = r } + if !c.Config.OpenStdin { + cfg.Stdin = nil + } + waitChan := make(chan struct{}) if c.Config.StdinOnce && !c.Config.Tty { defer func() {