Skip to content

Commit 955c2b2

Browse files
authored
Merge pull request #6122 from thaJeztah/bump_c8d
vendor: containerd v2.1.4, binaries v2.1.4, v2.0.6, v1.7.28
2 parents 7d85616 + 847ee3b commit 955c2b2

File tree

8 files changed

+91
-57
lines changed

8 files changed

+91
-57
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# syntax=docker/dockerfile-upstream:master
22

33
ARG RUNC_VERSION=v1.3.0
4-
ARG CONTAINERD_VERSION=v2.1.1
4+
ARG CONTAINERD_VERSION=v2.1.4
55
# CONTAINERD_ALT_VERSION_... defines fallback containerd version for integration tests
6-
ARG CONTAINERD_ALT_VERSION_20=v2.0.5
7-
ARG CONTAINERD_ALT_VERSION_17=v1.7.27
6+
ARG CONTAINERD_ALT_VERSION_20=v2.0.6
7+
ARG CONTAINERD_ALT_VERSION_17=v1.7.28
88
ARG REGISTRY_VERSION=v2.8.3
99
ARG ROOTLESSKIT_VERSION=v2.3.5
1010
ARG CNI_VERSION=v1.7.1

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/containerd/accelerated-container-image v1.3.0
1919
github.com/containerd/console v1.0.5
2020
github.com/containerd/containerd/api v1.9.0
21-
github.com/containerd/containerd/v2 v2.1.3
21+
github.com/containerd/containerd/v2 v2.1.4
2222
github.com/containerd/continuity v0.4.5
2323
github.com/containerd/errdefs v1.0.0
2424
github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.6

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/q
9595
github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
9696
github.com/containerd/containerd/api v1.9.0 h1:HZ/licowTRazus+wt9fM6r/9BQO7S0vD5lMcWspGIg0=
9797
github.com/containerd/containerd/api v1.9.0/go.mod h1:GhghKFmTR3hNtyznBoQ0EMWr9ju5AqHjcZPsSpTKutI=
98-
github.com/containerd/containerd/v2 v2.1.3 h1:eMD2SLcIQPdMlnlNF6fatlrlRLAeDaiGPGwmRKLZKNs=
99-
github.com/containerd/containerd/v2 v2.1.3/go.mod h1:8C5QV9djwsYDNhxfTCFjWtTBZrqjditQ4/ghHSYjnHM=
98+
github.com/containerd/containerd/v2 v2.1.4 h1:/hXWjiSFd6ftrBOBGfAZ6T30LJcx1dBjdKEeI8xucKQ=
99+
github.com/containerd/containerd/v2 v2.1.4/go.mod h1:8C5QV9djwsYDNhxfTCFjWtTBZrqjditQ4/ghHSYjnHM=
100100
github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
101101
github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
102102
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=

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

Lines changed: 48 additions & 29 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/client/task.go

Lines changed: 7 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/core/remotes/docker/fetcher.go

Lines changed: 28 additions & 18 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/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/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ github.com/containerd/containerd/api/types/runc/options
295295
github.com/containerd/containerd/api/types/runtimeoptions/v1
296296
github.com/containerd/containerd/api/types/task
297297
github.com/containerd/containerd/api/types/transfer
298-
# github.com/containerd/containerd/v2 v2.1.3
298+
# github.com/containerd/containerd/v2 v2.1.4
299299
## explicit; go 1.23.0
300300
github.com/containerd/containerd/v2/client
301301
github.com/containerd/containerd/v2/core/containers

0 commit comments

Comments
 (0)