[docker] fix container ID extraction for RancherOS #2466
Merged
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 #2454
Lines in
/proc/$PID/cgroup
don't have the same format for all system.3:cpu,cpuacct:/system.slice/docker-$CONTAINER_ID.scope
5:cpu,cpuacct:/docker/$USER_DOCKER_CID/docker/$CONTAINER_ID
4:cpuacct:/docker/$CONTAINER_ID
To avoid picking the first (wrong) container ID, let's switch from
search
tore.findall
.