Merge pull request #3007 from jterry75/fix_tty_windows

crosbymichael · web-flow · commit cb748dba9854 · 2019-02-12T10:52:29.000-05:00
Stop sending stderr with TTY on Windows
diff --git a/cmd/ctr/commands/tasks/tasks_windows.go b/cmd/ctr/commands/tasks/tasks_windows.go
@@ -64,7 +64,7 @@ func NewTask(ctx gocontext.Context, client *containerd.Client, container contain
 		if nullIO {
 			return nil, errors.New("tty and null-io cannot be used together")
 		}
-		ioCreator = cio.NewCreator(append([]cio.Opt{cio.WithStreams(con, con, con), cio.WithTerminal}, ioOpts...)...)
+		ioCreator = cio.NewCreator(append([]cio.Opt{cio.WithStreams(con, con, nil), cio.WithTerminal}, ioOpts...)...)
 	} else if nullIO {
 		ioCreator = cio.NullIO
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func NewTask(ctx gocontext.Context, client *containerd.Client, container contain`
`64`	`64`	`if nullIO {`
`65`	`65`	`return nil, errors.New("tty and null-io cannot be used together")`
`66`	`66`	`}`
`67`		`- ioCreator = cio.NewCreator(append([]cio.Opt{cio.WithStreams(con, con, con), cio.WithTerminal}, ioOpts...)...)`
	`67`	`+ ioCreator = cio.NewCreator(append([]cio.Opt{cio.WithStreams(con, con, nil), cio.WithTerminal}, ioOpts...)...)`
`68`	`68`	`} else if nullIO {`
`69`	`69`	`ioCreator = cio.NullIO`
`70`	`70`	`} else {`