diff options
| author | David Calavera <david.calavera@gmail.com> | 2015-11-12 11:55:17 -0800 |
|---|---|---|
| committer | Tibor Vass <tibor@docker.com> | 2015-12-03 17:39:49 +0100 |
| commit | 6bb0d1816acd8d4f7a542a6aac047da2b874f476 (patch) | |
| tree | 91ffa9a6d1a19c524c4d38279deac3b0e2e4fbe3 /daemon/attach.go | |
| parent | 33ab2bb52c130380e038013d68fdd8ad3c663360 (diff) | |
| download | docker-6bb0d1816acd8d4f7a542a6aac047da2b874f476.tar.gz | |
Move Container to its own package.
So other packages don't need to import the daemon package when they
want to use this struct.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Diffstat (limited to 'daemon/attach.go')
| -rw-r--r-- | daemon/attach.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/daemon/attach.go b/daemon/attach.go index 047828b17d..b024a063fd 100644 --- a/daemon/attach.go +++ b/daemon/attach.go @@ -5,6 +5,7 @@ import ( "time" "github.com/Sirupsen/logrus" + "github.com/docker/docker/container" "github.com/docker/docker/daemon/logger" "github.com/docker/docker/pkg/stdcopy" ) @@ -66,7 +67,7 @@ func (daemon *Daemon) ContainerWsAttachWithLogs(prefixOrName string, c *Containe return daemon.attachWithLogs(container, c.InStream, c.OutStream, c.ErrStream, c.Logs, c.Stream) } -func (daemon *Daemon) attachWithLogs(container *Container, stdin io.ReadCloser, stdout, stderr io.Writer, logs, stream bool) error { +func (daemon *Daemon) attachWithLogs(container *container.Container, stdin io.ReadCloser, stdout, stderr io.Writer, logs, stream bool) error { if logs { logDriver, err := daemon.getLogger(container) if err != nil { |