Remove transient sysinfo package now that moby has moved away from containerd v1 #3909
+26
−1,129
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
apostasie
changed the title
During the migration to containerd v2, we forked sysinfo as docker was still depending on containerd v1 at that time. With their latest 28 release, docker has now moved on, and we can get rid of the fork. There is a few minor changes required to make it work: - move to runtime.NumCPU as the sysinfo indirection has been removed - remove use of deprecated fields Signed-off-by: apostasie <[email protected]>
apostasie
force-pushed
the
docker-deprecation
branch
from
57c3cd2 to
0128d4a
Compare
|
CI failure is #3513 @AkihiroSuda if you can poke the CI, this is ready-to-go otherwise. |
|
CI failure is #3556 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
During the migration to containerd v2, we forked sysinfo as docker was still depending on containerd v1 at that time.
With their latest 28 release, docker has now moved on, and we can get rid of the fork.
This PR removes the fork and bump docker dep to the required version.
There are also a few minor changes required to make it work:
runtime.NumCPUas the sysinfo indirection has been removed upstream