Skip to content

Commit ef588da

Browse files
authored
Merge pull request #3646 from AkihiroSuda/dev
update containerd (2.0.0), runc (1.2.1), BuildKit (0.17.0), etc.
2 parents b9e9d0a + 7103b54 commit ef588da

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

.github/workflows/test.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
containerd: v1.7.23
3232
arch: amd64
3333
- runner: ubuntu-24.04
34-
containerd: v2.0.0-rc.5
34+
containerd: v2.0.0
3535
arch: amd64
3636
- runner: arm64-8core-32gb
37-
containerd: v2.0.0-rc.5
37+
containerd: v2.0.0
3838
arch: arm64
3939
env:
4040
CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -114,11 +114,11 @@ jobs:
114114
runner: "ubuntu-22.04"
115115
arch: amd64
116116
- ubuntu: 24.04
117-
containerd: v2.0.0-rc.5
117+
containerd: v2.0.0
118118
runner: "ubuntu-24.04"
119119
arch: amd64
120120
- ubuntu: 24.04
121-
containerd: v2.0.0-rc.5
121+
containerd: v2.0.0
122122
runner: arm64-8core-32gb
123123
arch: arm64
124124
env:
@@ -168,7 +168,7 @@ jobs:
168168
matrix:
169169
include:
170170
- ubuntu: 24.04
171-
containerd: v2.0.0-rc.5
171+
containerd: v2.0.0
172172
arch: amd64
173173
env:
174174
CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -240,7 +240,7 @@ jobs:
240240
target: rootless
241241
arch: amd64
242242
- ubuntu: 24.04
243-
containerd: v2.0.0-rc.5
243+
containerd: v2.0.0
244244
rootlesskit: v2.3.1
245245
target: rootless
246246
arch: amd64

Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
# TODO: verify commit hash
1919

2020
# Basic deps
21-
ARG CONTAINERD_VERSION=v2.0.0-rc.6
22-
ARG RUNC_VERSION=v1.2.0
21+
ARG CONTAINERD_VERSION=v2.0.0
22+
ARG RUNC_VERSION=v1.2.1
2323
ARG CNI_PLUGINS_VERSION=v1.6.0
2424

2525
# Extra deps: Build
26-
ARG BUILDKIT_VERSION=v0.16.0
26+
ARG BUILDKIT_VERSION=v0.17.0
2727
# Extra deps: Lazy-pulling
2828
ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1
2929
# Extra deps: Encryption
@@ -35,7 +35,7 @@ ARG SLIRP4NETNS_VERSION=v1.3.1
3535
ARG BYPASS4NETNS_VERSION=v0.4.1
3636
# Extra deps: FUSE-OverlayFS
3737
ARG FUSE_OVERLAYFS_VERSION=v1.14
38-
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8
38+
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.0.0
3939
# Extra deps: Init
4040
ARG TINI_VERSION=v0.19.0
4141
# Extra deps: Debug
@@ -47,7 +47,7 @@ ARG UBUNTU_VERSION=24.04
4747
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
4848
ARG GOTESTSUM_VERSION=v1.12.0
4949
ARG NYDUS_VERSION=v2.3.0
50-
ARG SOCI_SNAPSHOTTER_VERSION=0.7.0
50+
ARG SOCI_SNAPSHOTTER_VERSION=0.8.0
5151
ARG KUBO_VERSION=v0.31.0
5252

5353
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.5.0 AS xx

Dockerfile.d/SHA256SUMS.d/buildkit-v0.16.0

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
3a9fea5977df76e9008fa5fb3d9b5dd581729e8adced2180a45bd3c12a4d1331 buildkit-v0.17.0.linux-amd64.tar.gz
2+
5ec19fe78eeef2c03bef216d6890f05901fc117e7a66f88b423268dfcf5cf4af buildkit-v0.17.0.linux-arm64.tar.gz

Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.8

-6
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
dc20341234be8fa44e1308c9f38e30d7239c12350a046c83f4d1c804b682fe6c containerd-fuse-overlayfs-2.0.0-linux-amd64.tar.gz
2+
acfaa3a2caa6316b2c409bcb1c2600b6faee504188c412df8261024435dbfefc containerd-fuse-overlayfs-2.0.0-linux-arm-v7.tar.gz
3+
8b8032a4e0d16aedf7797818944147cebefad32e6657e0b7089501bcfc732e57 containerd-fuse-overlayfs-2.0.0-linux-arm64.tar.gz
4+
b4603139b2a532ac9ed8df3197669d3df5dfd9bebda2aa5f507ad6e6dbb1ed77 containerd-fuse-overlayfs-2.0.0-linux-ppc64le.tar.gz
5+
9e169b401e063cfb0b7b192f911dcb2532ec86a64844d8c052e076fe692017c3 containerd-fuse-overlayfs-2.0.0-linux-riscv64.tar.gz
6+
e8dfe8e2aff5b32f2f5698909baadd0cb36aa85704ff8c568f6bcae186e0ccc5 containerd-fuse-overlayfs-2.0.0-linux-s390x.tar.gz

0 commit comments

Comments
 (0)