Skip to content

Commit 9791bbc

Browse files
authored
Merge pull request #4125 from apostasie/bump-containerd-205
Update containerd to v2.0.5
2 parents c3b41b2 + a7a0ae7 commit 9791bbc

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
containerd: v1.6.38
3030
arch: amd64
3131
- runner: ubuntu-24.04
32-
containerd: v2.0.4
32+
containerd: v2.0.5
3333
arch: amd64
3434
- runner: ubuntu-24.04-arm
35-
containerd: v2.0.4
35+
containerd: v2.0.5
3636
arch: arm64
3737
env:
3838
CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -98,11 +98,11 @@ jobs:
9898
runner: "ubuntu-22.04"
9999
arch: amd64
100100
- ubuntu: 24.04
101-
containerd: v2.0.4
101+
containerd: v2.0.5
102102
runner: "ubuntu-24.04"
103103
arch: amd64
104104
- ubuntu: 24.04
105-
containerd: v2.0.4
105+
containerd: v2.0.5
106106
runner: "ubuntu-24.04-arm"
107107
arch: arm64
108108
env:
@@ -152,7 +152,7 @@ jobs:
152152
matrix:
153153
include:
154154
- ubuntu: 24.04
155-
containerd: v2.0.4
155+
containerd: v2.0.5
156156
arch: amd64
157157
env:
158158
CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -219,19 +219,19 @@ jobs:
219219
runner: "ubuntu-22.04"
220220
arch: amd64
221221
- ubuntu: 24.04
222-
containerd: v2.0.4
222+
containerd: v2.0.5
223223
rootlesskit: v2.3.4
224224
target: rootless
225225
arch: amd64
226226
runner: "ubuntu-24.04"
227227
- ubuntu: 24.04
228-
containerd: v2.0.4
228+
containerd: v2.0.5
229229
rootlesskit: v2.3.4
230230
target: rootless
231231
arch: arm64
232232
runner: "ubuntu-24.04-arm"
233233
- ubuntu: 24.04
234-
containerd: v2.0.4
234+
containerd: v2.0.5
235235
rootlesskit: v2.3.4
236236
target: rootless-port-slirp4netns
237237
arch: amd64
@@ -422,7 +422,7 @@ jobs:
422422
env:
423423
MODE: ${{ matrix.mode }}
424424
# FIXME: this is only necessary to access the build cache. To remove with build cleanup.
425-
CONTAINERD_VERSION: v2.0.4
425+
CONTAINERD_VERSION: v2.0.5
426426
steps:
427427
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
428428
with:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
# Basic deps
1919
# @BINARY: the binary checksums are verified via Dockerfile.d/SHA256SUMS.d/<COMPONENT>-<VERSION>
20-
ARG CONTAINERD_VERSION=v2.0.4@1a43cb6a1035441f9aca8f5666a9b3ef9e70ab20
20+
ARG CONTAINERD_VERSION=v2.0.5@fb4c30d4ede3531652d86197bf3fc9515e5276d9
2121
ARG RUNC_VERSION=v1.2.6@e89a29929c775025419ab0d218a43588b4c12b9a
2222
ARG CNI_PLUGINS_VERSION=v1.6.2@BINARY
2323

0 commit comments

Comments
 (0)