Merge pull request #476 from floatdrop/patch-1
Fix for «undefined: "github.com/dotcloud/docker/utils".StdCopy»
This commit is contained in:
commit
c220c1e00a
1 changed files with 2 additions and 1 deletions
|
@ -14,6 +14,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/dotcloud/docker/pkg/term"
|
"github.com/dotcloud/docker/pkg/term"
|
||||||
|
"github.com/dotcloud/docker/pkg/stdcopy"
|
||||||
"github.com/dotcloud/docker/utils"
|
"github.com/dotcloud/docker/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -208,7 +209,7 @@ func (c *Client) hijack(method, path string, setRawTerminal bool, out io.Writer)
|
||||||
if setRawTerminal {
|
if setRawTerminal {
|
||||||
_, err = io.Copy(out, br)
|
_, err = io.Copy(out, br)
|
||||||
} else {
|
} else {
|
||||||
_, err = utils.StdCopy(out, out, br)
|
_, err = stdcopy.StdCopy(out, out, br)
|
||||||
}
|
}
|
||||||
|
|
||||||
errStdout <- err
|
errStdout <- err
|
||||||
|
|
Loading…
Reference in a new issue