github/docker-labs
1
0
Fork 0
mirror of https://github.com/bingohuang/docker-labs.git synced 2025-07-15 02:37:27 +08:00
Code Issues Releases Wiki Activity

Change default dind detach keys to standard PQ can be used in PWD

Browse Source
This commit is contained in:
Marcos Lilljedahl 2016-11-14 17:49:34 -03:00
parent 46f95ce6a5
commit 227af2338d
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

@ -56,7 +56,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{Tty: true, AttachStdin: true, AttachStderr: true, AttachStdout: true, Cmd: []string{"sh"}} conf := types.ExecConfig{Tty: true, AttachStdin: true, AttachStderr: true, AttachStdout: true, Cmd: []string{"sh"}, DetachKeys: "ctrl-m,ctrl-o,ctrl-b,ctrl-y"}
resp, err := c.ContainerExecCreate(ctx, id, conf) resp, err := c.ContainerExecCreate(ctx, id, conf)
if err != nil { if err != nil {
return "", err return "", err
@ -66,7 +66,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{Tty: true, AttachStdin: true, AttachStderr: true, AttachStdout: true} conf := types.ExecConfig{Tty: true, AttachStdin: true, AttachStderr: true, AttachStdout: true, DetachKeys: "ctrl-m,ctrl-o,ctrl-b,ctrl-y"}
conn, err := c.ContainerExecAttach(ctx, execId, conf) conn, err := c.ContainerExecAttach(ctx, execId, conf)
if err != nil { if err != nil {