Merge pull request #969 from weaveworks/759-term-env-var

set TERM=xterm on execs to work around docker issue 9299
weaveworks · Feb 19, 2016 · 38653c4 · 38653c4
2 parents e6b60e3 + e49d1a7
commit 38653c4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/probe/docker/controls.go b/probe/docker/controls.go
@@ -99,7 +99,7 @@ func (r *registry) execContainer(containerID string, req xfer.Request) xfer.Resp
 		AttachStdout: true,
 		AttachStderr: true,
 		Tty:          true,
-		Cmd:          []string{"/bin/sh"},
+		Cmd:          []string{"/bin/sh", "-c", "TERM=xterm exec /bin/sh"},
 		Container:    containerID,
 	})
 	if err != nil {