toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move holdHijackConnection to the container package.

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6af6a3a5383642d2d7c3784f0f4e562dc324819a
Component: engine
This commit is contained in:
Daniel Nephin
2016-08-29 13:36:29 -04:00
parent f861cad6dd
commit 14da2ebf2c
9 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/api/client/container/exec.go
View File

@ -10,9 +10,8 @@ import (
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/types"
"github.com/docker/docker/cli"
"github.com/docker/docker/pkg/promise"
apiclient "github.com/docker/docker/client"
"github.com/docker/engine-api/types"
"github.com/docker/docker/pkg/promise"
"github.com/spf13/cobra"
)
@ -127,7 +126,7 @@ func runExec(dockerCli *client.DockerCli, opts *execOptions, container string, e
}
defer resp.Close()
errCh = promise.Go(func() error {
return dockerCli.HoldHijackedConnection(ctx, execConfig.Tty, in, out, stderr, resp)
return holdHijackedConnection(ctx, dockerCli, execConfig.Tty, in, out, stderr, resp)
})
if execConfig.Tty && dockerCli.In().IsTerminal() {