Skip to content

Commit ff93238

Browse files
authored
Merge pull request #4404 from AkihiroSuda/dev
update containerd (2.1.3), BuildKit (0.23.2), slirp4netns (1.3.3), etc.
2 parents e642916 + 2da141b commit ff93238

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

.github/workflows/workflow-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ jobs:
141141
go-version: 1.24
142142
windows-cni-version: v0.3.1
143143
docker-version: 5:28.0.4-1~ubuntu.24.04~noble
144-
containerd-version: 2.1.1
144+
containerd-version: 2.1.3
145145
# Note: these as for amd64
146-
containerd-sha: 918e88fd393c28c89424e6535df0546ca36c1dfa7d8a5d685dee70b449380a9b
146+
containerd-sha: 436cc160c33b37ec25b89fb5c72fc879ab2b3416df5d7af240c3e9c2f4065d3c
147147
containerd-service-sha: 1941362cbaa89dd591b99c32b050d82c583d3cd2e5fa63085d7017457ec5fca8
148148
linux-cni-version: v1.7.1
149149
linux-cni-sha: 1a28a0506bfe5bcdc981caf1a49eeab7e72da8321f1119b7be85f22621013098

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717

1818
# Basic deps
1919
# @BINARY: the binary checksums are verified via Dockerfile.d/SHA256SUMS.d/<COMPONENT>-<VERSION>
20-
ARG CONTAINERD_VERSION=v2.1.1@cb1076646aa3740577fafbf3d914198b7fe8e3f7
20+
ARG CONTAINERD_VERSION=v2.1.3@c787fb98911740dd3ff2d0e45ce88cdf01410486
2121
ARG RUNC_VERSION=v1.3.0@4ca628d1d4c974f92d24daccb901aa078aad748e
2222
ARG CNI_PLUGINS_VERSION=v1.7.1@BINARY
2323

2424
# Extra deps: Build
25-
ARG BUILDKIT_VERSION=v0.21.1@BINARY
25+
ARG BUILDKIT_VERSION=v0.23.2@BINARY
2626
# Extra deps: Lazy-pulling
2727
ARG STARGZ_SNAPSHOTTER_VERSION=v0.16.3@BINARY
2828
# Extra deps: Encryption
2929
ARG IMGCRYPT_VERSION=v2.0.1@c377ec98ff79ec9205eabf555ebd2ea784738c6c
3030
# Extra deps: Rootless
3131
ARG ROOTLESSKIT_VERSION=v2.3.5@BINARY
32-
ARG SLIRP4NETNS_VERSION=v1.3.2@BINARY
32+
ARG SLIRP4NETNS_VERSION=v1.3.3@BINARY
3333
# Extra deps: bypass4netns
3434
ARG BYPASS4NETNS_VERSION=v0.4.2@aa04bd3dcc48c6dae6d7327ba219bda8fe2a4634
3535
# Extra deps: FUSE-OverlayFS
@@ -47,10 +47,10 @@ ARG GOMODJAIL_VERSION=v0.1.2@0a86b34442a491fa8f5e4565e9c846fce310239c
4747
ARG GO_VERSION=1.24
4848
ARG UBUNTU_VERSION=24.04
4949
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
50-
ARG GOTESTSUM_VERSION=0d9599e513d70e5792bb9334869f82f6e8b53d4d
51-
ARG NYDUS_VERSION=v2.3.1
50+
ARG GOTESTSUM_VERSION=v1.12.3
51+
ARG NYDUS_VERSION=v2.3.2
5252
ARG SOCI_SNAPSHOTTER_VERSION=0.11.1
53-
ARG KUBO_VERSION=v0.34.1
53+
ARG KUBO_VERSION=v0.35.0
5454

5555
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.6.1@sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3 AS xx
5656

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

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2771c3403e3a1f75a83cde387a05365794d3b900c355e864772a36c3ce541f82 buildkit-v0.23.2.linux-amd64.tar.gz
2+
6385ff70b2fb4134b50ac3183eea3a0b06c6f6129173940d73178ae0477368f1 buildkit-v0.23.2.linux-arm64.tar.gz

Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.3.2

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
d0e6a13342efbedb8b7454629a0e9ce9b7a937c261034c85f46ed81af76307d8 SOURCE_DATE_EPOCH
2+
1ca9d2f5f1fb4beb91f354653e5dad35b95c049afb264268d99a96ff2a10d903 slirp4netns-aarch64
3+
3e209d1c56fccbe627a038d311b233c15e8d914b30f9b981b5ed78b98e836859 slirp4netns-armv7l
4+
4d1003a98103ee170c0fcd4aad8a5e0ba7aa2e70fbca883cbb6a39f40447c8da slirp4netns-ppc64le
5+
06a13b398d88120097b20dace966d7dd5e2fbfd284b95a086347808df392200e slirp4netns-riscv64
6+
23d4a206edd6d3fc9c86f8b05c0881ff77a607b8d471f20964ad9f9c3f3176b1 slirp4netns-s390x
7+
5618887b671a30a2f7548f2bdf7fba98a53981abc80cfd3183cd28b4dc8b2b97 slirp4netns-x86_64

0 commit comments

Comments
 (0)