Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-64608] Fix cgroup v2 detection of Docker CLI running inside a container #280

Merged

Conversation

jglick
Copy link
Member

@jglick jglick commented Oct 21, 2022

Trying to see if the likes of #241 / #276 can be mechanically reproduced both locally and in CI.

@jglick
Copy link
Member Author

jglick commented Oct 21, 2022

$ 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.

@jglick
Copy link
Member Author

jglick commented Oct 22, 2022

Passes on CI; perhaps CI is using v1?

@jglick jglick marked this pull request as ready for review October 22, 2022 00:39
@jglick jglick changed the title [JENKINS-64608] Reproduce problem in test case [JENKINS-64608] Fix cgroup v2 detection of Docker CLI running inside a container Oct 22, 2022
@gmasil
Copy link

gmasil commented Oct 24, 2022

I can confirm that this PR works with cgroups v2!
Voting for merge!

@rsandell
Copy link
Member

Does this replace the other two PRs?

@rsandell rsandell added the bug label Oct 24, 2022
@rsandell rsandell merged commit c508932 into jenkinsci:master Oct 24, 2022
@jglick jglick deleted the runningInsideContainer-JENKINS-64608 branch October 24, 2022 12:32
@jglick
Copy link
Member Author

jglick commented Oct 24, 2022

Does this replace the other two PRs?

Yes, I believe so.

@gmasil
Copy link

gmasil commented Oct 24, 2022

Does this replace the other two PRs?

Yes, correct.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants