github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ctr: exec setup IO with console

Browse Source 
Use cio.WithStreams with explicit console device when --tty is passed,
consistent with how ctr run behaves.

Signed-off-by: Samuel Karp <me@samuelkarp.com>
This commit is contained in:
Samuel Karp 2021-05-22 20:44:35 -07:00
parent a0efc54795
commit b9378b4529
No known key found for this signature in database
GPG Key ID: AAA3FE8A831FC087
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/ctr/commands/tasks/exec.go
View File

@ -114,9 +114,18 @@ var execCommand = cli.Command{
stdinC = &stdinCloser{ stdinC = &stdinCloser{
stdin: os.Stdin, stdin: os.Stdin,
} }
con console.Console
) )
if logURI := context.String("log-uri"); logURI != "" { ioOpts := []cio.Opt{cio.WithFIFODir(context.String("fifo-dir"))}
if tty {
con = console.Current()
defer con.Reset()
if err := con.SetRaw(); err != nil {
return err
}
ioCreator = cio.NewCreator(append([]cio.Opt{cio.WithStreams(con, con, nil), cio.WithTerminal}, ioOpts...)...)
} else if logURI := context.String("log-uri"); logURI != "" {
uri, err := url.Parse(logURI) uri, err := url.Parse(logURI)
if err != nil { if err != nil {
return err return err
@ -132,11 +141,7 @@ var execCommand = cli.Command{
ioCreator = cio.LogURI(uri) ioCreator = cio.LogURI(uri)
} else { } else {
cioOpts := []cio.Opt{cio.WithStreams(stdinC, os.Stdout, os.Stderr), cio.WithFIFODir(context.String("fifo-dir"))} ioCreator = cio.NewCreator(append([]cio.Opt{cio.WithStreams(stdinC, os.Stdout, os.Stderr)}, ioOpts...)...)
if tty {
cioOpts = append(cioOpts, cio.WithTerminal)
}
ioCreator = cio.NewCreator(cioOpts...)
} }
process, err := task.Exec(ctx, context.String("exec-id"), pspec, ioCreator) process, err := task.Exec(ctx, context.String("exec-id"), pspec, ioCreator)
@ -156,14 +161,6 @@ var execCommand = cli.Command{
return err return err
} }
var con console.Console
if tty {
con = console.Current()
defer con.Reset()
if err := con.SetRaw(); err != nil {
return err
}
}
if !detach { if !detach {
if tty { if tty {
if err := HandleConsoleResize(ctx, process, con); err != nil { if err := HandleConsoleResize(ctx, process, con); err != nil {