diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-05 06:29:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-05 06:29:05 -0500 |
| commit | c421127dd7f700829a8e5265d8ddad102061bebc (patch) | |
| tree | 7e5b527e5afb3cecff9dad2d225c12bfca9e0c38 | |
| parent | 42d4652fed759904bb51a5d3420724dc25009494 (diff) | |
| parent | 821ef6486a63f7dcf7f120e4010bb4d6f1e65b9d (diff) | |
| download | podman-c421127dd7f700829a8e5265d8ddad102061bebc.tar.gz podman-c421127dd7f700829a8e5265d8ddad102061bebc.tar.bz2 podman-c421127dd7f700829a8e5265d8ddad102061bebc.zip | |
Merge pull request #9231 from vrothberg/rootfs-workdir
fix logic when not creating a workdir
| -rw-r--r-- | libpod/container_internal_linux.go | 1 | ||||
| -rw-r--r-- | test/system/030-run.bats | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 6c9489a08..ba85a1f47 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -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). diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 6c3812dce..3749dcac5 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -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 |