Skip to content

Commit 474cae7

Browse files
authored
Merge pull request #6339 from AkihiroSuda/containerd-2.2
go.mod: github.com/containerd/containerd/v2 v2.2.0
2 parents 46de852 + 5803ef6 commit 474cae7

File tree

8 files changed

+62
-37
lines changed

8 files changed

+62
-37
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ require (
1919
github.com/cespare/xxhash/v2 v2.3.0
2020
github.com/containerd/accelerated-container-image v1.3.0
2121
github.com/containerd/console v1.0.5
22-
github.com/containerd/containerd/api v1.10.0-rc.0
23-
github.com/containerd/containerd/v2 v2.2.0-rc.1
22+
github.com/containerd/containerd/api v1.10.0
23+
github.com/containerd/containerd/v2 v2.2.0
2424
github.com/containerd/continuity v0.4.5
2525
github.com/containerd/errdefs v1.0.0
2626
github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.6
2727
github.com/containerd/go-cni v1.1.13
2828
github.com/containerd/go-runc v1.1.0
2929
github.com/containerd/log v0.1.0
3030
github.com/containerd/nydus-snapshotter v0.15.4
31-
github.com/containerd/platforms v1.0.0-rc.1
31+
github.com/containerd/platforms v1.0.0-rc.2
3232
github.com/containerd/stargz-snapshotter v0.17.0
3333
github.com/containerd/stargz-snapshotter/estargz v0.17.0
3434
github.com/containerd/typeurl/v2 v2.2.3

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ github.com/containerd/cgroups/v3 v3.1.0 h1:azxYVj+91ZgSnIBp2eI3k9y2iYQSR/ZQIgh9v
100100
github.com/containerd/cgroups/v3 v3.1.0/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
101101
github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/qqsc=
102102
github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
103-
github.com/containerd/containerd/api v1.10.0-rc.0 h1:PEaPRT4atfXLlbr3HaZH/i7/2PZK/+sUnp210HkhXmY=
104-
github.com/containerd/containerd/api v1.10.0-rc.0/go.mod h1:GhghKFmTR3hNtyznBoQ0EMWr9ju5AqHjcZPsSpTKutI=
105-
github.com/containerd/containerd/v2 v2.2.0-rc.1 h1:806y9qsFiZkwl90DJhtAtedG43OcmGd57sJCFyvfxpo=
106-
github.com/containerd/containerd/v2 v2.2.0-rc.1/go.mod h1:X7H17UATRidzfNzb5vS/l30qEJk0ktoTEU1thMh0Nbk=
103+
github.com/containerd/containerd/api v1.10.0 h1:5n0oHYVBwN4VhoX9fFykCV9dF1/BvAXeg2F8W6UYq1o=
104+
github.com/containerd/containerd/api v1.10.0/go.mod h1:NBm1OAk8ZL+LG8R0ceObGxT5hbUYj7CzTmR3xh0DlMM=
105+
github.com/containerd/containerd/v2 v2.2.0 h1:K7TqcXy+LnFmZaui2DgHsnp2gAHhVNWYaHlx7HXfys8=
106+
github.com/containerd/containerd/v2 v2.2.0/go.mod h1:YCMjKjA4ZA7egdHNi3/93bJR1+2oniYlnS+c0N62HdE=
107107
github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
108108
github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
109109
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
@@ -122,8 +122,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
122122
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
123123
github.com/containerd/nydus-snapshotter v0.15.4 h1:l59kGRVMtwMLDLh322HsWhEsBCkRKMkGWYV5vBeLYCE=
124124
github.com/containerd/nydus-snapshotter v0.15.4/go.mod h1:eRJqnxQDr48HNop15kZdLZpFF5B6vf6Q11Aq1K0E4Ms=
125-
github.com/containerd/platforms v1.0.0-rc.1 h1:83KIq4yy1erSRgOVHNk1HYdPvzdJ5CnsWaRoJX4C41E=
126-
github.com/containerd/platforms v1.0.0-rc.1/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=
125+
github.com/containerd/platforms v1.0.0-rc.2 h1:0SPgaNZPVWGEi4grZdV8VRYQn78y+nm6acgLGv/QzE4=
126+
github.com/containerd/platforms v1.0.0-rc.2/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=
127127
github.com/containerd/plugin v1.0.0 h1:c8Kf1TNl6+e2TtMHZt+39yAPDbouRH9WAToRjex483Y=
128128
github.com/containerd/plugin v1.0.0/go.mod h1:hQfJe5nmWfImiqT1q8Si3jLv3ynMUIBB47bQ+KexvO8=
129129
github.com/containerd/stargz-snapshotter v0.17.0 h1:djNS4KU8ztFhLdEDZ1bsfzOiYuVHT6TgSU5qwRk+cNc=

vendor/github.com/containerd/containerd/v2/defaults/defaults_darwin.go

Lines changed: 19 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/v2/defaults/defaults_unix_nolinux.go renamed to vendor/github.com/containerd/containerd/v2/defaults/defaults_unix_other.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/v2/version/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/platforms/defaults_windows.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/platforms/platform_windows_compat.go

Lines changed: 28 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ github.com/containerd/cgroups/v3/cgroup1/stats
312312
# github.com/containerd/console v1.0.5
313313
## explicit; go 1.13
314314
github.com/containerd/console
315-
# github.com/containerd/containerd/api v1.10.0-rc.0
315+
# github.com/containerd/containerd/api v1.10.0
316316
## explicit; go 1.23.0
317317
github.com/containerd/containerd/api/events
318318
github.com/containerd/containerd/api/runtime/sandbox/v1
@@ -336,7 +336,7 @@ github.com/containerd/containerd/api/types/runc/options
336336
github.com/containerd/containerd/api/types/runtimeoptions/v1
337337
github.com/containerd/containerd/api/types/task
338338
github.com/containerd/containerd/api/types/transfer
339-
# github.com/containerd/containerd/v2 v2.2.0-rc.1
339+
# github.com/containerd/containerd/v2 v2.2.0
340340
## explicit; go 1.24.3
341341
github.com/containerd/containerd/v2/client
342342
github.com/containerd/containerd/v2/core/containers
@@ -454,7 +454,7 @@ github.com/containerd/log
454454
github.com/containerd/nydus-snapshotter/pkg/converter
455455
github.com/containerd/nydus-snapshotter/pkg/converter/tool
456456
github.com/containerd/nydus-snapshotter/pkg/label
457-
# github.com/containerd/platforms v1.0.0-rc.1
457+
# github.com/containerd/platforms v1.0.0-rc.2
458458
## explicit; go 1.20
459459
github.com/containerd/platforms
460460
# github.com/containerd/plugin v1.0.0

0 commit comments

Comments
 (0)