Merge pull request #3007 from jterry75/fix_tty_windows

Stop sending stderr with TTY on Windows
This commit is contained in:
Michael Crosby 2019-02-12 10:52:29 -05:00 committed by GitHub
commit cb748dba98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -64,7 +64,7 @@ func NewTask(ctx gocontext.Context, client *containerd.Client, container contain
if nullIO { if nullIO {
return nil, errors.New("tty and null-io cannot be used together") 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 { } else if nullIO {
ioCreator = cio.NullIO ioCreator = cio.NullIO
} else { } else {