From 227af2338d0c83ab0c7a4d48e8105eb737d2c381 Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Mon, 14 Nov 2016 17:49:34 -0300 Subject: [PATCH] Change default dind detach keys to standard PQ can be used in PWD --- services/docker.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/docker.go b/services/docker.go index bf3a88d..7d5d855 100644 --- a/services/docker.go +++ b/services/docker.go @@ -56,7 +56,7 @@ func DeleteNetwork(id 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) if err != nil { 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) { - 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) if err != nil {