Merge pull request #1989 from alexlarsson/setsid

Container: Always create a new session for the container
Upstream-commit: 1363de0934ce65bda21f831a6b55f28b3e0d13e7
Component: engine

components/engine/container.go

@@ -393,7 +393,7 @@ func (container *Container) startPty() error {
 	// stdin
 	if container.Config.OpenStdin {
 		container.cmd.Stdin = ptySlave
-		container.cmd.SysProcAttr = &syscall.SysProcAttr{Setctty: true, Setsid: true}
+		container.cmd.SysProcAttr.Setctty = true
 		go func() {
 			defer container.stdin.Close()
 			utils.Debugf("[startPty] Begin of stdin pipe")
@@ -800,6 +800,8 @@ func (container *Container) Start(hostConfig *HostConfig) error {
 		return err
 	}
 
+	container.cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
+
 	var err error
 	if container.Config.Tty {
 		err = container.startPty()