Fix handling of working dir #7239
Conversation
openshift-ci-robot
added
the
approved
|
LGTM |
|
Fixes containers/buildah#2402 |
| if s.WorkDir == "" { | ||
| s.WorkDir = "/" | ||
| } else { | ||
| options = append(options, libpod.WithCreateWorkingDir()) |
There was a problem hiding this comment.
I thought we decided to only do this for entrypoint specified by the image - if the user specifies /ect accidentally we would still error on that?
There was a problem hiding this comment.
Ok then I need to remove the test.
| if newWD != "" { | ||
| options = append(options, libpod.WithCreateWorkingDir()) | ||
| } | ||
| s.WorkDir = newWD |
There was a problem hiding this comment.
I don't think we should be modifying the specgen here - maybe in CreateContainer, not createContainerOptions?
There was a problem hiding this comment.
The problem is WithCreateWorkingDir works off of that field. Or we have to do the check twice.
There was a problem hiding this comment.
Ok reworked it placing the WorkDir check into CreateContainer.
rhatdan
force-pushed
the
working
branch
2 times, most recently
from
999e81c to
a35a9ed
Compare
|
Mitigates: containers/buildah#2475 |
|
@ashley-cui FYI |
|
@mheon Turns out runc will create workingdir on the image, if it does not exist, while crun will not. Changed test to only run on crun systems. |
|
Yeah, it's a lovely difference. |
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 <[email protected]>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe, rhatdan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
github-actions
bot
added
the
locked - please file new issue/PR
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 [email protected]