[JENKINS-64608] Fix cgroup v2 detection of Docker CLI running inside a container#280
Merged
rsandell merged 2 commits intojenkinsci:masterfrom Oct 24, 2022
Merged
Conversation
Member
Author
$ find /proc -type f | xargs -n1 timeout 1 fgrep -l 34c7ed00892c97fb6ac1efdd82ab74e5fb54b1c01ea37b3de2e9b35583c94049 2>&-
/proc/1/task/1/mountinfo
/proc/1/mountinfo
/proc/11331/task/11331/cmdline
/proc/11331/task/11331/mountinfo
/proc/11331/cmdline
/proc/11331/mountinfo(as #241 (comment)) seems promising. The trick in #276 less so, because it yields only a shorted id, and requires running a process. |
Member
Author
|
Passes on CI; perhaps CI is using v1? |
|
I can confirm that this PR works with cgroups v2! |
rsandell
approved these changes
Oct 24, 2022
Member
|
Does this replace the other two PRs? |
Member
Author
Yes, I believe so. |
Yes, correct. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Trying to see if the likes of #241 / #276 can be mechanically reproduced both locally and in CI.