summaryrefslogtreecommitdiff
path: root/pkg/specgen/container_validate.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-08-05 16:28:47 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-08-10 12:46:05 -0400
commitafa823e4e71c5bf7a00f048c3c7b86746877dbf2 (patch)
treed05c666b4b18d180ba7a60e6b0f85c51f1b365e7 /pkg/specgen/container_validate.go
parent162625f2e74c8ad9bf9a7337baaa2621bbf0a26e (diff)
downloadpodman-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/container_validate.go')
-rw-r--r--pkg/specgen/container_validate.go5
1 files changed, 0 insertions, 5 deletions
diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go
index 1a1bb4526..8289e2089 100644
--- a/pkg/specgen/container_validate.go
+++ b/pkg/specgen/container_validate.go
@@ -142,11 +142,6 @@ func (s *SpecGenerator) Validate() error {
return err
}
- // The following are defaults as needed by container creation
- if len(s.WorkDir) < 1 {
- s.WorkDir = "/"
- }
-
// Set defaults if network info is not provided
if s.NetNS.NSMode == "" {
s.NetNS.NSMode = Bridge