kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Remove missed code path for api < 1.12 

Signed-off-by: Antonio Murdaca <runcom@linux.com>
This commit is contained in:
Antonio Murdaca 2015-06-17 17:00:48 +02:00
parent 9ad87523c0
commit b6a6c56915
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/server/server.go
View File

@ -1124,7 +1124,6 @@ func (s *Server) postContainersAttach(version version.Version, w http.ResponseWr
UseStderr: boolValue(r, "stderr"),
Logs: boolValue(r, "logs"),
Stream: boolValue(r, "stream"),
Multiplex: version.GreaterThanOrEqualTo("1.6"),
}
if err := s.daemon.ContainerAttachWithLogs(vars["name"], attachWithLogsConfig); err != nil {

3
daemon/attach.go
View File

@ -11,7 +11,6 @@ type ContainerAttachWithLogsConfig struct {
OutStream io.Writer
UseStdin, UseStdout, UseStderr bool
Logs, Stream bool
Multiplex bool
}
func (daemon *Daemon) ContainerAttachWithLogs(name string, c *ContainerAttachWithLogsConfig) error {
@ -22,7 +21,7 @@ func (daemon *Daemon) ContainerAttachWithLogs(name string, c *ContainerAttachWit
var errStream io.Writer
if !container.Config.Tty && c.Multiplex {
if !container.Config.Tty {
errStream = stdcopy.NewStdWriter(c.OutStream, stdcopy.Stderr)
c.OutStream = stdcopy.NewStdWriter(c.OutStream, stdcopy.Stdout)
} else {