@@ -16,6 +16,7 @@ import (

 	"golang.org/x/net/context"

 	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/container/stream"

 	"github.com/docker/docker/daemon/exec"

 	"github.com/docker/docker/daemon/logger"

 	"github.com/docker/docker/daemon/logger/jsonfilelog"

@@ -59,7 +60,7 @@ func (DetachError) Error() string {

 // CommonContainer holds the fields for a container which are

 // applicable across all platforms supported by the daemon.

 type CommonContainer struct {

-	*runconfig.StreamConfig

+	StreamConfig *stream.Config

 	// embed for Container to support states directly.

 	*State          `json:"State"` // Needed for remote api version <= 1.11

 	Root            string         `json:"-"` // Path to the "home" of the container, including metadata.

@@ -102,7 +103,7 @@ func NewBaseContainer(id, root string) *Container {

 			ExecCommands:  exec.NewStore(),

 			Root:          root,

 			MountPoints:   make(map[string]*volume.MountPoint),

-			StreamConfig:  runconfig.NewStreamConfig(),

+			StreamConfig:  stream.NewConfig(),

 			attachContext: &attachContext{},

 		},

 	}

@@ -367,7 +368,7 @@ func (container *Container) Attach(stdin io.ReadCloser, stdout io.Writer, stderr

 // AttachStreams connects streams to a TTY.

 // Used by exec too. Should this move somewhere else?

-func AttachStreams(ctx context.Context, streamConfig *runconfig.StreamConfig, openStdin, stdinOnce, tty bool, stdin io.ReadCloser, stdout io.Writer, stderr io.Writer, keys []byte) chan error {

+func AttachStreams(ctx context.Context, streamConfig *stream.Config, openStdin, stdinOnce, tty bool, stdin io.ReadCloser, stdout io.Writer, stderr io.Writer, keys []byte) chan error {

 	var (

 		cStdout, cStderr io.ReadCloser

 		cStdin           io.WriteCloser

@@ -997,6 +998,26 @@ func (container *Container) startLogging() error {

 	return nil

 }

+// StdinPipe gets the stdin stream of the container

+func (container *Container) StdinPipe() io.WriteCloser {

+	return container.StreamConfig.StdinPipe()

+}

+

+// StdoutPipe gets the stdout stream of the container

+func (container *Container) StdoutPipe() io.ReadCloser {

+	return container.StreamConfig.StdoutPipe()

+}

+

+// StderrPipe gets the stderr stream of the container

+func (container *Container) StderrPipe() io.ReadCloser {

+	return container.StreamConfig.StderrPipe()

+}

+

+// CloseStreams closes the container's stdio streams

+func (container *Container) CloseStreams() error {

+	return container.StreamConfig.CloseStreams()

+}

+

 // InitializeStdio is called by libcontainerd to connect the stdio.

 func (container *Container) InitializeStdio(iop libcontainerd.IOPipe) error {

 	if err := container.startLogging(); err != nil {

@@ -1006,7 +1027,7 @@ func (container *Container) InitializeStdio(iop libcontainerd.IOPipe) error {

 	container.StreamConfig.CopyToPipe(iop)

-	if container.Stdin() == nil && !container.Config.Tty {

+	if container.StreamConfig.Stdin() == nil && !container.Config.Tty {

 		if iop.Stdin != nil {

 			if err := iop.Stdin.Close(); err != nil {

 				logrus.Warnf("error closing stdin: %+v", err)

@@ -23,7 +23,7 @@ func (container *Container) Reset(lock bool) {

 	// Re-create a brand new stdin pipe once the container exited

 	if container.Config.OpenStdin {

-		container.NewInputPipes()

+		container.StreamConfig.NewInputPipes()

 	}

 	if container.LogDriver != nil {

new file mode 100644

@@ -0,0 +1,143 @@

+package stream

+

+import (

+	"fmt"

+	"io"

+	"io/ioutil"

+	"strings"

+	"sync"

+

+	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/libcontainerd"

+	"github.com/docker/docker/pkg/broadcaster"

+	"github.com/docker/docker/pkg/ioutils"

+	"github.com/docker/docker/pkg/pools"

+)

+

+// Config holds information about I/O streams managed together.

+//

+// config.StdinPipe returns a WriteCloser which can be used to feed data

+// to the standard input of the streamConfig's active process.

+// config.StdoutPipe and streamConfig.StderrPipe each return a ReadCloser

+// which can be used to retrieve the standard output (and error) generated

+// by the container's active process. The output (and error) are actually

+// copied and delivered to all StdoutPipe and StderrPipe consumers, using

+// a kind of "broadcaster".

+type Config struct {

+	sync.WaitGroup

+	stdout    *broadcaster.Unbuffered

+	stderr    *broadcaster.Unbuffered

+	stdin     io.ReadCloser

+	stdinPipe io.WriteCloser

+}

+

+// NewConfig creates a stream config and initializes

+// the standard err and standard out to new unbuffered broadcasters.

+func NewConfig() *Config {

+	return &Config{

+		stderr: new(broadcaster.Unbuffered),

+		stdout: new(broadcaster.Unbuffered),

+	}

+}

+

+// Stdout returns the standard output in the configuration.

+func (c *Config) Stdout() *broadcaster.Unbuffered {

+	return c.stdout

+}

+

+// Stderr returns the standard error in the configuration.

+func (c *Config) Stderr() *broadcaster.Unbuffered {

+	return c.stderr

+}

+

+// Stdin returns the standard input in the configuration.

+func (c *Config) Stdin() io.ReadCloser {

+	return c.stdin

+}

+

+// StdinPipe returns an input writer pipe as an io.WriteCloser.

+func (c *Config) StdinPipe() io.WriteCloser {

+	return c.stdinPipe

+}

+

+// StdoutPipe creates a new io.ReadCloser with an empty bytes pipe.

+// It adds this new out pipe to the Stdout broadcaster.

+func (c *Config) StdoutPipe() io.ReadCloser {

+	bytesPipe := ioutils.NewBytesPipe()

+	c.stdout.Add(bytesPipe)

+	return bytesPipe

+}

+

+// StderrPipe creates a new io.ReadCloser with an empty bytes pipe.

+// It adds this new err pipe to the Stderr broadcaster.

+func (c *Config) StderrPipe() io.ReadCloser {

+	bytesPipe := ioutils.NewBytesPipe()

+	c.stderr.Add(bytesPipe)

+	return bytesPipe

+}

+

+// NewInputPipes creates new pipes for both standard inputs, Stdin and StdinPipe.

+func (c *Config) NewInputPipes() {

+	c.stdin, c.stdinPipe = io.Pipe()

+}

+

+// NewNopInputPipe creates a new input pipe that will silently drop all messages in the input.

+func (c *Config) NewNopInputPipe() {

+	c.stdinPipe = ioutils.NopWriteCloser(ioutil.Discard)

+}

+

+// CloseStreams ensures that the configured streams are properly closed.

+func (c *Config) CloseStreams() error {

+	var errors []string

+

+	if c.stdin != nil {

+		if err := c.stdin.Close(); err != nil {

+			errors = append(errors, fmt.Sprintf("error close stdin: %s", err))

+		}

+	}

+

+	if err := c.stdout.Clean(); err != nil {

+		errors = append(errors, fmt.Sprintf("error close stdout: %s", err))

+	}

+

+	if err := c.stderr.Clean(); err != nil {

+		errors = append(errors, fmt.Sprintf("error close stderr: %s", err))

+	}

+

+	if len(errors) > 0 {

+		return fmt.Errorf(strings.Join(errors, "\n"))

+	}

+

+	return nil

+}

+

+// CopyToPipe connects streamconfig with a libcontainerd.IOPipe

+func (c *Config) CopyToPipe(iop libcontainerd.IOPipe) {

+	copyFunc := func(w io.Writer, r io.Reader) {

+		c.Add(1)

+		go func() {

+			if _, err := pools.Copy(w, r); err != nil {

+				logrus.Errorf("stream copy error: %+v", err)

+			}

+			c.Done()

+		}()

+	}

+

+	if iop.Stdout != nil {

+		copyFunc(c.Stdout(), iop.Stdout)

+	}

+	if iop.Stderr != nil {

+		copyFunc(c.Stderr(), iop.Stderr)

+	}

+

+	if stdin := c.Stdin(); stdin != nil {

+		if iop.Stdin != nil {

+			go func() {

+				pools.Copy(iop.Stdin, stdin)

+				if err := iop.Stdin.Close(); err != nil {

+					logrus.Errorf("failed to close stdin: %+v", err)

+				}

+			}()

+		}

+	}

+}

@@ -89,9 +89,9 @@ func (daemon *Daemon) load(id string) (*container.Container, error) {

 func (daemon *Daemon) Register(c *container.Container) error {

 	// Attach to stdout and stderr

 	if c.Config.OpenStdin {

-		c.NewInputPipes()

+		c.StreamConfig.NewInputPipes()

 	} else {

-		c.NewNopInputPipe()

+		c.StreamConfig.NewNopInputPipe()

 	}

 	daemon.containers.Add(c.ID, c)

@@ -188,9 +188,9 @@ func (d *Daemon) ContainerExecStart(ctx context.Context, name string, stdin io.R

 	}

 	if ec.OpenStdin {

-		ec.NewInputPipes()

+		ec.StreamConfig.NewInputPipes()

 	} else {

-		ec.NewNopInputPipe()

+		ec.StreamConfig.NewNopInputPipe()

 	}

 	p := libcontainerd.Process{

@@ -5,9 +5,9 @@ import (

 	"sync"

 	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/container/stream"

 	"github.com/docker/docker/libcontainerd"

 	"github.com/docker/docker/pkg/stringid"

-	"github.com/docker/docker/runconfig"

 )

 // Config holds the configurations for execs. The Daemon keeps

@@ -15,28 +15,28 @@ import (

 // examined both during and after completion.

 type Config struct {

 	sync.Mutex

-	*runconfig.StreamConfig

-	ID          string

-	Running     bool

-	ExitCode    *int

-	OpenStdin   bool

-	OpenStderr  bool

-	OpenStdout  bool

-	CanRemove   bool

-	ContainerID string

-	DetachKeys  []byte

-	Entrypoint  string

-	Args        []string

-	Tty         bool

-	Privileged  bool

-	User        string

+	StreamConfig *stream.Config

+	ID           string

+	Running      bool

+	ExitCode     *int

+	OpenStdin    bool

+	OpenStderr   bool

+	OpenStdout   bool

+	CanRemove    bool

+	ContainerID  string

+	DetachKeys   []byte

+	Entrypoint   string

+	Args         []string

+	Tty          bool

+	Privileged   bool

+	User         string

 }

 // NewConfig initializes the a new exec configuration

 func NewConfig() *Config {

 	return &Config{

 		ID:           stringid.GenerateNonCryptoID(),

-		StreamConfig: runconfig.NewStreamConfig(),

+		StreamConfig: stream.NewConfig(),

 	}

 }

@@ -44,7 +44,7 @@ func NewConfig() *Config {

 func (c *Config) InitializeStdio(iop libcontainerd.IOPipe) error {

 	c.StreamConfig.CopyToPipe(iop)

-	if c.Stdin() == nil && !c.Tty && runtime.GOOS == "windows" {

+	if c.StreamConfig.Stdin() == nil && !c.Tty && runtime.GOOS == "windows" {

 		if iop.Stdin != nil {

 			if err := iop.Stdin.Close(); err != nil {

 				logrus.Errorf("error closing exec stdin: %+v", err)

@@ -55,6 +55,11 @@ func (c *Config) InitializeStdio(iop libcontainerd.IOPipe) error {

 	return nil

 }

+// CloseStreams closes the stdio streams for the exec

+func (c *Config) CloseStreams() error {

+	return c.StreamConfig.CloseStreams()

+}

+

 // Store keeps track of the exec configurations.

 type Store struct {

 	commands map[string]*Config

@@ -28,7 +28,7 @@ func (daemon *Daemon) StateChanged(id string, e libcontainerd.StateInfo) error {

 	case libcontainerd.StateExit:

 		c.Lock()

 		defer c.Unlock()

-		c.Wait()

+		c.StreamConfig.Wait()

 		c.Reset(false)

 		c.SetStopped(platformConstructExitStatus(e))

 		attributes := map[string]string{

@@ -63,7 +63,7 @@ func (daemon *Daemon) StateChanged(id string, e libcontainerd.StateInfo) error {

 			defer execConfig.Unlock()

 			execConfig.ExitCode = &ec

 			execConfig.Running = false

-			execConfig.Wait()

+			execConfig.StreamConfig.Wait()

 			if err := execConfig.CloseStreams(); err != nil {

 				logrus.Errorf("%s: %s", c.ID, err)

 			}

deleted file mode 100644

@@ -1,143 +0,0 @@

-package runconfig

-

-import (

-	"fmt"

-	"io"

-	"io/ioutil"

-	"strings"

-	"sync"

-

-	"github.com/Sirupsen/logrus"

-	"github.com/docker/docker/libcontainerd"

-	"github.com/docker/docker/pkg/broadcaster"

-	"github.com/docker/docker/pkg/ioutils"

-	"github.com/docker/docker/pkg/pools"

-)

-

-// StreamConfig holds information about I/O streams managed together.

-//

-// streamConfig.StdinPipe returns a WriteCloser which can be used to feed data

-// to the standard input of the streamConfig's active process.

-// streamConfig.StdoutPipe and streamConfig.StderrPipe each return a ReadCloser

-// which can be used to retrieve the standard output (and error) generated

-// by the container's active process. The output (and error) are actually

-// copied and delivered to all StdoutPipe and StderrPipe consumers, using

-// a kind of "broadcaster".

-type StreamConfig struct {

-	sync.WaitGroup

-	stdout    *broadcaster.Unbuffered

-	stderr    *broadcaster.Unbuffered

-	stdin     io.ReadCloser

-	stdinPipe io.WriteCloser

-}

-

-// NewStreamConfig creates a stream config and initializes

-// the standard err and standard out to new unbuffered broadcasters.

-func NewStreamConfig() *StreamConfig {

-	return &StreamConfig{

-		stderr: new(broadcaster.Unbuffered),

-		stdout: new(broadcaster.Unbuffered),

-	}

-}

-

-// Stdout returns the standard output in the configuration.

-func (streamConfig *StreamConfig) Stdout() *broadcaster.Unbuffered {

-	return streamConfig.stdout

-}

-

-// Stderr returns the standard error in the configuration.

-func (streamConfig *StreamConfig) Stderr() *broadcaster.Unbuffered {

-	return streamConfig.stderr

-}

-

-// Stdin returns the standard input in the configuration.

-func (streamConfig *StreamConfig) Stdin() io.ReadCloser {

-	return streamConfig.stdin

-}

-

-// StdinPipe returns an input writer pipe as an io.WriteCloser.

-func (streamConfig *StreamConfig) StdinPipe() io.WriteCloser {

-	return streamConfig.stdinPipe

-}

-

-// StdoutPipe creates a new io.ReadCloser with an empty bytes pipe.

-// It adds this new out pipe to the Stdout broadcaster.

-func (streamConfig *StreamConfig) StdoutPipe() io.ReadCloser {

-	bytesPipe := ioutils.NewBytesPipe()

-	streamConfig.stdout.Add(bytesPipe)

-	return bytesPipe

-}

-

-// StderrPipe creates a new io.ReadCloser with an empty bytes pipe.

-// It adds this new err pipe to the Stderr broadcaster.

-func (streamConfig *StreamConfig) StderrPipe() io.ReadCloser {

-	bytesPipe := ioutils.NewBytesPipe()

-	streamConfig.stderr.Add(bytesPipe)

-	return bytesPipe

-}

-

-// NewInputPipes creates new pipes for both standard inputs, Stdin and StdinPipe.

-func (streamConfig *StreamConfig) NewInputPipes() {

-	streamConfig.stdin, streamConfig.stdinPipe = io.Pipe()

-}

-

-// NewNopInputPipe creates a new input pipe that will silently drop all messages in the input.

-func (streamConfig *StreamConfig) NewNopInputPipe() {

-	streamConfig.stdinPipe = ioutils.NopWriteCloser(ioutil.Discard)

-}

-

-// CloseStreams ensures that the configured streams are properly closed.

-func (streamConfig *StreamConfig) CloseStreams() error {

-	var errors []string

-

-	if streamConfig.stdin != nil {

-		if err := streamConfig.stdin.Close(); err != nil {

-			errors = append(errors, fmt.Sprintf("error close stdin: %s", err))

-		}

-	}

-

-	if err := streamConfig.stdout.Clean(); err != nil {

-		errors = append(errors, fmt.Sprintf("error close stdout: %s", err))

-	}

-

-	if err := streamConfig.stderr.Clean(); err != nil {

-		errors = append(errors, fmt.Sprintf("error close stderr: %s", err))

-	}

-

-	if len(errors) > 0 {

-		return fmt.Errorf(strings.Join(errors, "\n"))

-	}

-

-	return nil

-}

-

-// CopyToPipe connects streamconfig with a libcontainerd.IOPipe

-func (streamConfig *StreamConfig) CopyToPipe(iop libcontainerd.IOPipe) {

-	copyFunc := func(w io.Writer, r io.Reader) {

-		streamConfig.Add(1)

-		go func() {

-			if _, err := pools.Copy(w, r); err != nil {

-				logrus.Errorf("stream copy error: %+v", err)

-			}

-			streamConfig.Done()

-		}()

-	}

-

-	if iop.Stdout != nil {

-		copyFunc(streamConfig.Stdout(), iop.Stdout)

-	}

-	if iop.Stderr != nil {

-		copyFunc(streamConfig.Stderr(), iop.Stderr)

-	}

-

-	if stdin := streamConfig.Stdin(); stdin != nil {

-		if iop.Stdin != nil {

-			go func() {

-				pools.Copy(iop.Stdin, stdin)

-				if err := iop.Stdin.Close(); err != nil {

-					logrus.Errorf("failed to close stdin: %+v", err)

-				}

-			}()

-		}

-	}

-}