diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-08-05 16:28:47 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-08-10 12:46:05 -0400 |
| commit | afa823e4e71c5bf7a00f048c3c7b86746877dbf2 (patch) | |
| tree | d05c666b4b18d180ba7a60e6b0f85c51f1b365e7 /pkg/specgen/generate/container_create.go | |
| parent | 162625f2e74c8ad9bf9a7337baaa2621bbf0a26e (diff) | |
| download | podman-afa823e4e71c5bf7a00f048c3c7b86746877dbf2.tar.gz podman-afa823e4e71c5bf7a00f048c3c7b86746877dbf2.tar.bz2 podman-afa823e4e71c5bf7a00f048c3c7b86746877dbf2.zip | |
Fix handling of working dir
Buildah and podman build can create images without a working dir.
FROM fedora
WORKDIR /test
If you build this image with caching twice, the second time the image
will not have a working dir.
Similarly if you execute
podman run --workdir /foobar fedora
It blows up since the workingdir is not created automatically.
Finally there was duplicated code for getting the workingdir
out of an image, that this PR removes.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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)) |