kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Set the raw mode only for tty enabled containers

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-04-04 21:51:40 -07:00 • committed by Louis Opter
parent d530d581f7
commit dcf4572a69
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
commands.go
View file

@ -787,7 +787,6 @@ func (srv *Server) CmdLogs(stdin io.ReadCloser, stdout io.Writer, args ...string
} }
func (srv *Server) CmdAttach(stdin io.ReadCloser, stdout rcli.DockerConn, args ...string) error { func (srv *Server) CmdAttach(stdin io.ReadCloser, stdout rcli.DockerConn, args ...string) error {
stdout.SetOptionRawTerminal()
cmd := rcli.Subcmd(stdout, "attach", "CONTAINER", "Attach to a running container") cmd := rcli.Subcmd(stdout, "attach", "CONTAINER", "Attach to a running container")
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
@ -802,6 +801,9 @@ func (srv *Server) CmdAttach(stdin io.ReadCloser, stdout rcli.DockerConn, args .
return fmt.Errorf("No such container: %s", name) return fmt.Errorf("No such container: %s", name)
} }
if container.Config.Tty {
stdout.SetOptionRawTerminal()
}
return <-container.Attach(stdin, nil, stdout, stdout) return <-container.Attach(stdin, nil, stdout, stdout)
} }
@ -874,7 +876,6 @@ func (srv *Server) CmdTag(stdin io.ReadCloser, stdout io.Writer, args ...string)
} }
func (srv *Server) CmdRun(stdin io.ReadCloser, stdout rcli.DockerConn, args ...string) error { func (srv *Server) CmdRun(stdin io.ReadCloser, stdout rcli.DockerConn, args ...string) error {
stdout.SetOptionRawTerminal()
config, err := ParseRun(args, stdout) config, err := ParseRun(args, stdout)
if err != nil { if err != nil {
return err return err
@ -887,6 +888,9 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout rcli.DockerConn, args ...s
fmt.Fprintln(stdout, "Error: Command not specified") fmt.Fprintln(stdout, "Error: Command not specified")
return fmt.Errorf("Command not specified") return fmt.Errorf("Command not specified")
} }
if config.Tty {
stdout.SetOptionRawTerminal()
}
// Create new container // Create new container
container, err := srv.runtime.Create(config) container, err := srv.runtime.Create(config)