Fix handling of .containenv on tmpfs #18535
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci
bot
added
do-not-merge/release-note-label-needed
edsantiago
reviewed
May 10, 2023
test/system/030-run.bats
Outdated
Comment on lines
574
to
578
| run_podman run --rm $IMAGE --tmpfs=/run stat -c '%s' /run/.containerenv | ||
| is "$output" "0" "file size of /run/.containerenv, --tmpfs mount" | ||
|
|
||
| run_podman run --rm $IMAGE --tmpfs=/run --init stat -c '%s' /run/.containerenv | ||
| is "$output" "0" "file size of /run/.containerenv, --tmpfs=/run --init mount" | ||
|
|
||
| run_podman run --rm $IMAGE --read-only stat -c '%s' /run/.containerenv | ||
| is "$output" "0" "file size of /run/.containerenv, --read-only" | ||
|
|
||
| run_podman run --rm $IMAGE --systemd-always stat -c '%s' /run/.containerenv | ||
| is "$output" "0" "file size of /run/.containerenv, --systemd-always" | ||
|
|
||
| run_podman 1 run --rm $IMAGE -v ${PODMAN_TMPDIR}:/run:Z stat -c '%s' /run/.containerenv | ||
| is "$output" "stat: can't stat '/run/.containerenv': No such file or directory" "do not create .containerenv on bind mounts" | ||
|
|
There was a problem hiding this comment.
broken, wrong option order. Gimme 5 minutes though for a suggestion.
There was a problem hiding this comment.
# Nonprivileged container: file exists, but must be empty
for opt in "" "--tmpfs=/run" "--tmpfs=/run --init" "--read-only" "--systemd=always"; do
run_podman run --rm $opt $IMAGE stat -c '%s' /run/.containerenv
is "$output" "0" "/run/.containerenv exists and is empty: podman run ${opt}"
done
run_podman 1 run --rm -v ${PODMAN_TMPDIR}:/run:Z $IMAGE stat -c '%s' /run/.containerenv
is "$output" "stat: can't stat '/run/.containerenv': No such file or directory" "do not create .containerenv on bind mounts"
|
[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 |
Luap99
reviewed
May 10, 2023
| case m.Destination == "/run/.containerenv": | ||
| hasRunContainerenv = true | ||
| break | ||
| case m.Destination == "/run" && m.Source != "tmpfs": |
There was a problem hiding this comment.
should this check for type tmpfs? The source could be anything when tmpfs is used.
There was a problem hiding this comment.
This was not addressed, please fix it!#
rhatdan
force-pushed
the
mount
branch
2 times, most recently
from
1f784d8 to
457bef5
Compare
|
LGTM. Swagger test has actually completed, long ago, even though (as of this writing) github still has it spinning. |
Luap99
reviewed
May 11, 2023
test/system/030-run.bats
Outdated
Comment on lines
570
to
573
| # Nonprivileged container: file exists, but must be empty | ||
| run_podman run --rm $IMAGE stat -c '%s' /run/.containerenv | ||
| is "$output" "0" "file size of /run/.containerenv, nonprivileged" | ||
|
|
||
|
|
||
| # Nonprivileged container: file exists, but must be empty |
There was a problem hiding this comment.
nit, same comment twice and unnecessary newlines
|
Other than the nit, LGTM |
|
Nasty red marks in the tests are still chasing after you @rhatdan |
Fixes: containers#18531 Signed-off-by: Daniel J Walsh <[email protected]>
github-actions
bot
added
the
locked - please file new issue/PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #18531
Does this PR introduce a user-facing change?