diff options
author | Matthew Heon <matthew.heon@pm.me> | 2020-07-31 17:08:06 -0400 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2020-08-03 14:44:52 -0400 |
commit | 333d9af77a65d860b5fd788805cd4c0f2cd232df (patch) | |
tree | ad5ac181ecd3a360c118c2fddeaba83182b86a05 /libpod/options.go | |
parent | 7a15be546adffe4f884abfbd4ed02f69ac7659e0 (diff) | |
download | podman-333d9af77a65d860b5fd788805cd4c0f2cd232df.tar.gz podman-333d9af77a65d860b5fd788805cd4c0f2cd232df.tar.bz2 podman-333d9af77a65d860b5fd788805cd4c0f2cd232df.zip |
Ensure WORKDIR from images is created
A recent crun change stopped the creation of the container's
working directory if it does not exist. This is arguably correct
for user-specified directories, to protect against typos; it is
definitely not correct for image WORKDIR, where the image author
definitely intended for the directory to be used.
This makes Podman create the working directory and chown it to
container root, if it does not already exist, and only if it was
specified by an image, not the user.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/options.go')
-rw-r--r-- | libpod/options.go | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libpod/options.go b/libpod/options.go index b98ef2221..16b05d9b6 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -1451,6 +1451,19 @@ func WithCreateCommand(cmd []string) CtrCreateOption { } } +// WithCreateWorkingDir tells Podman to create the container's working directory +// if it does not exist. +func WithCreateWorkingDir() CtrCreateOption { + return func(ctr *Container) error { + if ctr.valid { + return define.ErrCtrFinalized + } + + ctr.config.CreateWorkingDir = true + return nil + } +} + // Volume Creation Options // WithVolumeName sets the name of the volume. |