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.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.go')
| -rw-r--r-- | pkg/specgen/generate/container.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index 65f8197bc..53d160442 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -135,15 +135,18 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat s.Annotations = annotations // workdir - if newImage != nil { - workingDir, err := newImage.WorkingDir(ctx) - if err != nil { - return nil, err - } - if len(s.WorkDir) < 1 && len(workingDir) > 1 { + if s.WorkDir == "" { + if newImage != nil { + workingDir, err := newImage.WorkingDir(ctx) + if err != nil { + return nil, err + } s.WorkDir = workingDir } } + if s.WorkDir == "" { + s.WorkDir = "/" + } if len(s.SeccompProfilePath) < 1 { p, err := libpod.DefaultSeccompPath() |