From 4bc166446d61f9fde69c91e73b6043b8ba9040fc Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 15 Mar 2018 14:04:08 -0400 Subject: We should not have a default workdir Having a default workdir is causing us not to use the container images workdir. Signed-off-by: Daniel J Walsh Closes: #501 Approved by: mheon --- cmd/podman/common.go | 1 - cmd/podman/create.go | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 8dee6cb98..60cc48803 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -390,6 +390,5 @@ var createFlags = []cli.Flag{ cli.StringFlag{ Name: "workdir, w", Usage: "Working `directory inside the container", - Value: "/", }, } diff --git a/cmd/podman/create.go b/cmd/podman/create.go index b923ad458..462c56a51 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -566,8 +566,10 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string, } // WORKING DIRECTORY - workDir := c.String("workdir") - if workDir == "" { + workDir := "/" + if c.IsSet("workdir") { + workDir = c.String("workdir") + } else if data.ContainerConfig.WorkingDir != "" { workDir = data.ContainerConfig.WorkingDir } -- cgit v1.2.3-54-g00ecf