Merge pull request #1342 from aca/fix

Set correct PATH for exec form
This commit is contained in:
Tejal Desai 2020-08-13 14:20:04 -07:00 committed by GitHub
commit bfd92b5c6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions

View File

@ -63,6 +63,21 @@ func runCommandInExec(config *v1.Config, buildArgs *dockerfile.BuildArgs, cmdRun
newCommand = append(shell, strings.Join(cmdRun.CmdLine, " "))
} else {
newCommand = cmdRun.CmdLine
// Find and set absolute path of executable by setting PATH temporary
replacementEnvs := buildArgs.ReplacementEnvs(config.Env)
for _, v := range replacementEnvs {
entry := strings.SplitN(v, "=", 2)
if entry[0] != "PATH" {
continue
}
oldPath := os.Getenv("PATH")
defer os.Setenv("PATH", oldPath)
os.Setenv("PATH", entry[1])
path, err := exec.LookPath(newCommand[0])
if err == nil {
newCommand[0] = path
}
}
}
logrus.Infof("cmd: %s", newCommand[0])