|
@@ -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 {
|