github/docker-labs
1
0
Fork 0
mirror of https://github.com/bingohuang/docker-labs.git synced 2025-07-14 10:17:26 +08:00
Code Issues Releases Wiki Activity

Revert "Don't allocate a pseudo tty for shell attaches"

Browse Source 
This reverts commit d87e288f6ffa15cf72d8b90567a5cf02e902bf7f.
This commit is contained in:
Marcos Lilljedahl 2016-10-11 13:33:22 -03:00
parent d87e288f6f
commit 50a08f265c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/docker.go
View File

@ -54,7 +54,7 @@ func DeleteNetwork(id string) error {
} }
func CreateExecConnection(id string, ctx context.Context) (string, error) { func CreateExecConnection(id string, ctx context.Context) (string, error) {
conf := types.ExecConfig{AttachStdin: true, AttachStderr: true, AttachStdout: true, Cmd: []string{"sh"}} conf := types.ExecConfig{Tty: true, AttachStdin: true, AttachStderr: true, AttachStdout: true, Cmd: []string{"sh"}}
resp, err := c.ContainerExecCreate(ctx, id, conf) resp, err := c.ContainerExecCreate(ctx, id, conf)
if err != nil { if err != nil {
return "", err return "", err
@ -64,7 +64,7 @@ func CreateExecConnection(id string, ctx context.Context) (string, error) {
} }
func AttachExecConnection(execId string, ctx context.Context) (*types.HijackedResponse, error) { func AttachExecConnection(execId string, ctx context.Context) (*types.HijackedResponse, error) {
conf := types.ExecConfig{AttachStdin: true, AttachStderr: true, AttachStdout: true} conf := types.ExecConfig{Tty: true, AttachStdin: true, AttachStderr: true, AttachStdout: true}
conn, err := c.ContainerExecAttach(ctx, execId, conf) conn, err := c.ContainerExecAttach(ctx, execId, conf)
if err != nil { if err != nil {