summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-12 11:26:01 -0400
committerGitHub <noreply@github.com>2020-06-12 11:26:01 -0400
commit3f026eb6a682a68e69f9376b72157a8f084e575c (patch)
treecdd8503582bb5c515c81ffb41a8c867825946f04 /cmd
parent92dafdcab8e8dd28b931ca26513c12bb878ce95c (diff)
parent2386a2ef2dd3ab4976a3e1dd6d76616e8558d85b (diff)
downloadpodman-3f026eb6a682a68e69f9376b72157a8f084e575c.tar.gz
podman-3f026eb6a682a68e69f9376b72157a8f084e575c.tar.bz2
podman-3f026eb6a682a68e69f9376b72157a8f084e575c.zip
Merge pull request #6587 from rhatdan/workdir
Do not default WorkingDir to / on client side
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/common/specgen.go6
1 files changed, 1 insertions, 5 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index fee9d8c7b..2a5ebea3c 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -385,11 +385,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
}
s.Annotations = annotations
- workDir := "/"
- if wd := c.Workdir; len(wd) > 0 {
- workDir = wd
- }
- s.WorkDir = workDir
+ s.WorkDir = c.Workdir
entrypoint := []string{}
userCommand := []string{}
if c.Entrypoint != nil {