diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-11 06:22:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 06:22:57 -0400 |
| commit | 68c67d24308710d5ad23ee5ddeb35293e2123fb6 (patch) | |
| tree | 191865f910fc6d20e95f88ec46d14da58f77d404 /pkg/specgen/generate/container_create.go | |
| parent | a90ae00df1c2be0f3d46d4e7cd292599c93ded0f (diff) | |
| parent | afa823e4e71c5bf7a00f048c3c7b86746877dbf2 (diff) | |
| download | podman-68c67d24308710d5ad23ee5ddeb35293e2123fb6.tar.gz podman-68c67d24308710d5ad23ee5ddeb35293e2123fb6.tar.bz2 podman-68c67d24308710d5ad23ee5ddeb35293e2123fb6.zip | |
Merge pull request #7239 from rhatdan/working
Fix handling of working dir
Diffstat (limited to 'pkg/specgen/generate/container_create.go')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index b61ac2c30..4635b755b 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -241,13 +241,7 @@ func createContainerOptions(ctx context.Context, rt *libpod.Runtime, s *specgen. // If the user did not set an workdir but the image did, ensure it is // created. if s.WorkDir == "" && img != nil { - newWD, err := img.WorkingDir(ctx) - if err != nil { - return nil, err - } - if newWD != "" { - options = append(options, libpod.WithCreateWorkingDir()) - } + options = append(options, libpod.WithCreateWorkingDir()) } if s.StopSignal != nil { options = append(options, libpod.WithStopSignal(*s.StopSignal)) |