container runlabel respect $PWD

When doing environment variable substitution, we need to make sure
$PWD is replaced with the current working directory.

fixes issue #2171

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2019-03-08 10:32:33 -06:00
parent 8c54126b6f
commit 24f567a3db

View File

@ -665,6 +665,14 @@ func GenerateRunlabelCommand(runLabel, imageName, name string, opts map[string]s
return envmap["OPT2"] return envmap["OPT2"]
case "OPT3": case "OPT3":
return envmap["OPT3"] return envmap["OPT3"]
case "PWD":
// I would prefer to use os.getenv but it appears PWD is not in the os env list
d, err := os.Getwd()
if err != nil {
logrus.Error("unable to determine current working directory")
return ""
}
return d
} }
return "" return ""
} }