summaryrefslogtreecommitdiff
path: root/daemon/attach.go
diff options
context:
space:
mode:
authorDavid Calavera <david.calavera@gmail.com>2016-01-27 17:09:42 -0500
committerDavid Calavera <david.calavera@gmail.com>2016-02-08 12:42:17 -0500
commit06d8f504f7b1883f490b5deda5a30ef9acd99f95 (patch)
tree144ff9ecdcd7f75ab3c6bb17c5a6f6e8235e396f /daemon/attach.go
parentdd93571c69cc5284f695a21d5504fb57b1a4891a (diff)
downloaddocker-06d8f504f7b1883f490b5deda5a30ef9acd99f95.tar.gz
Move backend types to their own package.
- Remove duplicated structs that we already have in engine-api. Signed-off-by: David Calavera <david.calavera@gmail.com>
Diffstat (limited to 'daemon/attach.go')
-rw-r--r--daemon/attach.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon/attach.go b/daemon/attach.go
index aabc77082a..4faa460e37 100644
--- a/daemon/attach.go
+++ b/daemon/attach.go
@@ -6,11 +6,11 @@ import (
"time"
"github.com/Sirupsen/logrus"
+ "github.com/docker/docker/api/types/backend"
"github.com/docker/docker/container"
"github.com/docker/docker/daemon/logger"
derr "github.com/docker/docker/errors"
"github.com/docker/docker/pkg/stdcopy"
- "github.com/docker/engine-api/types/backend"
)
// ContainerAttachWithLogs attaches to logs according to the config passed in. See ContainerAttachWithLogsConfig.
@@ -81,7 +81,7 @@ func (daemon *Daemon) ContainerWsAttachWithLogs(prefixOrName string, c *backend.
// ContainerAttachOnBuild attaches streams to the container cID. If stream is true, it streams the output.
func (daemon *Daemon) ContainerAttachOnBuild(cID string, stdin io.ReadCloser, stdout, stderr io.Writer, stream bool) error {
- return daemon.ContainerWsAttachWithLogs(cID, &ContainerWsAttachWithLogsConfig{
+ return daemon.ContainerWsAttachWithLogs(cID, &backend.ContainerWsAttachWithLogsConfig{
InStream: stdin,
OutStream: stdout,
ErrStream: stderr,