Merge pull request #9231 from vrothberg/rootfs-workdir

fix logic when not creating a workdir
This commit is contained in:
OpenShift Merge Robot
2021-02-05 06:29:05 -05:00
committed by GitHub
2 changed files with 14 additions and 0 deletions

View File

@ -213,6 +213,7 @@ func (c *Container) resolveWorkDir() error {
// we need to return the full error.
return errors.Wrapf(err, "error detecting workdir %q on container %s", workdir, c.ID())
}
return nil
}
// Ensure container entrypoint is created (if required).

View File

@ -608,6 +608,19 @@ json-file | f
# a subdir of a volume.
run_podman run --rm --workdir /IamNotOntheImage -v $testdir/content:/IamNotOntheImage/foo $IMAGE cat foo
is "$output" "$randomcontent" "cat random content"
# Make sure that running on a read-only rootfs works (#9230).
if ! is_rootless && ! is_remote; then
# image mount is hard to test as a rootless user
# and does not work remotely
run_podman image mount $IMAGE
romount="$output"
run_podman run --rm --rootfs $romount echo "Hello world"
is "$output" "Hello world"
run_podman image unmount $IMAGE
fi
}
# https://github.com/containers/podman/issues/9096