From 24f567a3db68efe67273b63cd50a003f0b6c5621 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 8 Mar 2019 10:32:33 -0600 Subject: 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 --- cmd/podman/shared/container.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go index 81811e0f2..e191e8069 100644 --- a/cmd/podman/shared/container.go +++ b/cmd/podman/shared/container.go @@ -665,6 +665,14 @@ func GenerateRunlabelCommand(runLabel, imageName, name string, opts map[string]s return envmap["OPT2"] case "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 "" } -- cgit v1.2.3-54-g00ecf