Merge pull request #37 from tonistiigi/close-stdin

Close stdin after data has been copied
gojoy · Dec 17, 2015 · c4f3b71 · c4f3b71
2 parents e489dd8 + ae5c752
commit c4f3b71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ctr/container.go b/ctr/container.go
@@ -131,6 +131,7 @@ var StartCommand = cli.Command{
 				if state != nil {
 					term.RestoreTerminal(os.Stdin.Fd(), state)
 				}
+				stdin.Close()
 			}()
 			for {
 				e, err := events.Recv()
@@ -335,6 +336,7 @@ var ExecCommand = cli.Command{
 				if state != nil {
 					term.RestoreTerminal(os.Stdin.Fd(), state)
 				}
+				stdin.Close()
 			}()
 			for {
 				e, err := events.Recv()

diff --git a/io.go b/io.go
@@ -25,7 +25,10 @@ func newCopier(i *ioConfig) (*copier, error) {
 			return nil, err
 		}
 		l.closers = append(l.closers, f)
-		go io.Copy(i.Stdin, f)
+		go func() {
+			io.Copy(i.Stdin, f)
+			i.Stdin.Close()
+		}()
 	}
 	if i.StdoutPath != "" {
 		f, err := os.OpenFile(i.StdoutPath, os.O_RDWR, 0)