Revendor containerd/containerd to 5c72f92a5#1346
Conversation
Snapshotter.Walk changed, and the introspection API changed. The prompt is to remove the transitive CGO requirement on Windows, removed in containerd/containerd#3970. This maintains the hand-managed 1.4.0 version per moby#1205 > go mod tidy > # Fix pseudoversions, to make Go Modules happy > go get github.com/containerd/containerd@5c72f92a5d924fdd699e761d022991266a77ed51 > go mod vendor > # Revert pseudoversions, to make module-resolution rational Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
|
duplicate: #1297 |
#1297 doesn't appear to bump containerd or hcsshim. Edit: Whoops. It seems to have bumped it, but didn't change go.mod in the process. It's not bumped high enough though... Perhaps I should rebase this on top of #1297? Edit: I see now. #1297 is doing a replace for containerd and docker, but with a different commit to the entry in the require list, which seems like a mistake. |
|
WIP as it actually doesn't achieve what I want yet... The hcsshim version from containerd isn't visible to the go modules system as containerd doesn't have a go.mod. Instead it's picking up 0.8.5 as an indirect from tonistiigi/fsutil, which still has the CGO dependency. |
|
Hmm. Build fails due to https://sum.golang.org/lookup/github.com/containerd/containerd@v1.3.1-0.20200125045834-5c72f92a5d92 gives the same checksum as go.sum, but I guess the build script is running go 1.12, and gets the checksum from somewhere else. Same thing is true of the version that's in master, https://sum.golang.org/lookup/github.com/containerd/containerd@v1.3.1-0.20191014053712-acdcf13d5eaf shows a different checksum to the committed go.sum. I assume this is a 1.12/1.13 difference. -_- |
|
Putting this aside for now. I'll wait for #1297 to land before I play with this again, as it's already trying to work though the issues I'm expecting to see here. |
Walkin thesnapshots.Snapshotterinterface added a parameter, and theintrospection.Serviceinterface was refactored leading to a simplerPluginscall.The prompt for revendoring is to remove the transitive CGO requirement on Windows, removed from containerd in containerd/containerd#3970.
This maintains the hand-managed 1.4.0 version per #1205
This process looks correct, but the diff shows a lot of
// +build ignorefiles being deleted from other vendored modules, so I suspect this is not the same process others have used.It also newly-vendored
github.com/google/uuid, I'm not sure why, it doesn't appear to be a containerd/containerd change, so it's probably also due to usinggo mod vendor.Full commit history for containerd is containerd/containerd@acdcf13...5c72f92, covering around 3.5 months of development, and 137 non-merge commits.