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

This commit is contained in:
Dale Tristram
2018-08-07 10:09:49 -07:00
committed by priyawadhwa
parent 53b5fb41d2
commit 2261adca68
+1 -1
View File
@@ -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")