diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-26 16:59:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 16:59:57 +0100 |
| commit | ad1e0bb77f56499ff22eeb8123aaab8e57a43c03 (patch) | |
| tree | 2d51bab04ef8f221273d3f9d18aceb847daf5dc1 /pkg/specgen/generate/container.go | |
| parent | 41dd1eb8a22f6ac70dd48b53993c9d6ce4476eb4 (diff) | |
| parent | 0f668aa0857815f388ef1bb880efa4b2e889edaf (diff) | |
| download | podman-ad1e0bb77f56499ff22eeb8123aaab8e57a43c03.tar.gz podman-ad1e0bb77f56499ff22eeb8123aaab8e57a43c03.tar.bz2 podman-ad1e0bb77f56499ff22eeb8123aaab8e57a43c03.zip | |
Merge pull request #9054 from vrothberg/fix-9040
make sure the workdir exists on container mount
Diffstat (limited to 'pkg/specgen/generate/container.go')
| -rw-r--r-- | pkg/specgen/generate/container.go | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index cc3f7928c..31d317bf8 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -203,20 +203,6 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat } s.Annotations = annotations - // workdir - 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() if err != nil { |