opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9231 from vrothberg/rootfs-workdir

Browse Source 
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
parent 42d4652fed 821ef6486a
commit c421127dd7
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libpod/container_internal_linux.go
View File

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

13
test/system/030-run.bats
View File

@ -608,6 +608,19 @@ json-file | f
# a subdir of a volume. # a subdir of a volume.
run_podman run --rm --workdir /IamNotOntheImage -v $testdir/content:/IamNotOntheImage/foo $IMAGE cat foo run_podman run --rm --workdir /IamNotOntheImage -v $testdir/content:/IamNotOntheImage/foo $IMAGE cat foo
is "$output" "$randomcontent" "cat random content" 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 # https://github.com/containers/podman/issues/9096