Migrate from containerd v1 to v2 and docker/docker to moby/moby#1924
Open
jeffmendoza wants to merge 3 commits intogoogle:mainfrom
Open
Migrate from containerd v1 to v2 and docker/docker to moby/moby#1924jeffmendoza wants to merge 3 commits intogoogle:mainfrom
jeffmendoza wants to merge 3 commits intogoogle:mainfrom
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
Signed-off-by: Jeff Mendoza <jlm@jlm.name>
18bb388 to
fa651b5
Compare
3658a7f to
2c97715
Compare
Signed-off-by: Jeff Mendoza <jlm@jlm.name>
2c97715 to
2b27be3
Compare
Signed-off-by: Jeff Mendoza <jlm@jlm.name>
86842a1 to
aa35a9a
Compare
Contributor
Author
|
@spencerschrock @another-rex This is good to go. Thanks! |
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
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.
Looks like repos that import docker or buildkit have a critical vuln, and can't update to the latest as the older containred/containerd does not build with the newer opencontainers/runtime-spec. Osv-scailber seems to be holding on
to the older 1.7 containerd.
Edit: Also update docker/docker to moby/moby to remove more vulns.
Edit2: Some dep updates required moving from Go 1.24 to 1.25. This introduced "sync.WaitGroup.Go()" which the linter was now recommending.
Summary
Migrates from
github.com/containerd/containerd v1.7.23togithub.com/containerd/containerd/v2 v2.2.2.Background
buildkit v0.27.0+ requires
containerd/cgroups/v3 v3.1.2which in turn requiresopencontainers/runtime-spec v1.3.0. That version changedLinuxPids.Limitfromint64to*int64, making it incompatible with containerd v1.7.x:cgroups/v3 v3.1.2dereferencesPids.Limitas*int64containerd v1.7.x/oci/spec_opts.goassigns toPids.Limitasint64These are mutually exclusive. This PR upgrades containerd to v2 to resolve the conflict.
Changes
go.mod: Removedcontainerd/containerd v1.7.23, addedcontainerd/containerd/v2 v2.2.2as direct dependency;containerd/containerd/apiupgraded tov1.10.0;containerd/cgroups/v3upgraded tov3.1.2github.com/containerd/containerd→github.com/containerd/containerd/v2/clientgithub.com/containerd/containerd/metadata→github.com/containerd/containerd/v2/core/metadatagithub.com/containerd/containerd/namespaces→github.com/containerd/containerd/v2/pkg/namespacesgithub.com/containerd/containerd/cio→github.com/containerd/containerd/v2/pkg/ciogithub.com/containerd/containerd/containers→github.com/containerd/containerd/v2/core/containersgithub.com/containerd/containerd/oci→github.com/containerd/containerd/v2/pkg/ocicontainerd/api/...) remain unchanged as they are a separate moduleTesting
go test ./extractor/standalone/containers/containerd/... ./extractor/filesystem/containers/containerd/...go build ./...