Ensure cmd.SysProcAttr is set before modifying it (#275)

Uvedale · priyawadhwa · commit 2261adca68ec · 2018-08-07T10:09:49.000-07:00
diff --git a/pkg/commands/run.go b/pkg/commands/run.go
@@ -60,6 +60,7 @@ func (r *RunCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfile.Bui
 	cmd.Stderr = os.Stderr
 	replacementEnvs := buildArgs.ReplacementEnvs(config.Env)
 	cmd.Env = replacementEnvs
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 
 	// If specified, run the command as a specific user
 	if config.User != "" {
@@ -91,7 +92,6 @@ func (r *RunCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfile.Bui
 		}
 		cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uid, Gid: gid}
 	}
-	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 
 	if err := cmd.Start(); err != nil {
 		return errors.Wrap(err, "starting command")

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ func (r RunCommand) ExecuteCommand(config v1.Config, buildArgs *dockerfile.Bui`
`60`	`60`	`cmd.Stderr = os.Stderr`
`61`	`61`	`replacementEnvs := buildArgs.ReplacementEnvs(config.Env)`
`62`	`62`	`cmd.Env = replacementEnvs`
	`63`	`+ cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}`
`63`	`64`
`64`	`65`	`// If specified, run the command as a specific user`
`65`	`66`	`if config.User != "" {`
`@@ -91,7 +92,6 @@ func (r RunCommand) ExecuteCommand(config v1.Config, buildArgs *dockerfile.Bui`
`91`	`92`	`}`
`92`	`93`	`cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uid, Gid: gid}`
`93`	`94`	`}`
`94`		`- cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}`
`95`	`95`
`96`	`96`	`if err := cmd.Start(); err != nil {`
`97`	`97`	`return errors.Wrap(err, "starting command")`