Skip to content

Commit 2a2834d

Browse files
authored
Merge pull request #4275 from AkihiroSuda/dev
update containerd (2.1.1), containerd-fuse-overlayfs (2.1.6), buildg (0.5.3)
2 parents c9f1cf6 + 15cd2e0 commit 2a2834d

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
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.0
144+
containerd-version: 2.1.1
145145
# Note: these as for amd64
146-
containerd-sha: 0e5359e957b66b679be807563a543c7416e305e3aafcf56bad90ef87a917014d
146+
containerd-sha: 918e88fd393c28c89424e6535df0546ca36c1dfa7d8a5d685dee70b449380a9b
147147
containerd-service-sha: 1941362cbaa89dd591b99c32b050d82c583d3cd2e5fa63085d7017457ec5fca8
148148
linux-cni-version: v1.7.1
149149
linux-cni-sha: 1a28a0506bfe5bcdc981caf1a49eeab7e72da8321f1119b7be85f22621013098

Dockerfile

Lines changed: 3 additions & 3 deletions
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.1.0@061792f0ecf3684fb30a3a0eb006799b8c6638a7
20+
ARG CONTAINERD_VERSION=v2.1.1@cb1076646aa3740577fafbf3d914198b7fe8e3f7
2121
ARG RUNC_VERSION=v1.3.0@4ca628d1d4c974f92d24daccb901aa078aad748e
2222
ARG CNI_PLUGINS_VERSION=v1.7.1@BINARY
2323

@@ -34,11 +34,11 @@ ARG SLIRP4NETNS_VERSION=v1.3.2@BINARY
3434
ARG BYPASS4NETNS_VERSION=v0.4.2@aa04bd3dcc48c6dae6d7327ba219bda8fe2a4634
3535
# Extra deps: FUSE-OverlayFS
3636
ARG FUSE_OVERLAYFS_VERSION=v1.15@BINARY
37-
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.5@BINARY
37+
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.6@BINARY
3838
# Extra deps: Init
3939
ARG TINI_VERSION=v0.19.0@BINARY
4040
# Extra deps: Debug
41-
ARG BUILDG_VERSION=v0.5.2@BINARY
41+
ARG BUILDG_VERSION=v0.5.3@BINARY
4242
# Extra deps: gomodjail
4343
ARG GOMODJAIL_VERSION=v0.1.2@0a86b34442a491fa8f5e4565e9c846fce310239c
4444

Dockerfile.d/SHA256SUMS.d/buildg-v0.5.2

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
cf4c40c58ca795eeb6e75e2c6a0e5bb3a6a9c0623d51bc3b85163e5d483eeade buildg-full-v0.5.3-linux-amd64.tar.gz
2+
47c479f2e5150c9c76294fa93a03ad20e5928f4315bf52ca8432bfb6707d4276 buildg-full-v0.5.3-linux-arm64.tar.gz
3+
c289a454ae8673ff99acf56dec9ba97274c20d2015e80f7ac3b8eb8e4f77888f buildg-v0.5.3-linux-amd64.tar.gz
4+
b2e244250ce7ea5c090388f2025a9c546557861d25bba7b0666aa512f01fa6cd buildg-v0.5.3-linux-arm64.tar.gz

Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v2.1.5

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
8a768e4c953251d32b5e5d748d17593f7150834caaba403b483cf83f5856fea3 containerd-fuse-overlayfs-2.1.6-linux-amd64.tar.gz
2+
a3af866a12e913cd1d4dda8e41c08345eca928a15ac1d466fdb2b00b013e14ee containerd-fuse-overlayfs-2.1.6-linux-arm-v7.tar.gz
3+
417ca0c838e43e446f498b384d73f7caaeb00dc4c1c0fe4b0ecfdd36fd355daa containerd-fuse-overlayfs-2.1.6-linux-arm64.tar.gz
4+
5fdebd9fb7b50473318f0410bc3ab46f3388ac8aa586b45c91a314af9ce6569c containerd-fuse-overlayfs-2.1.6-linux-ppc64le.tar.gz
5+
7e1a9d2ba68ff31a8dfb53bf6e71b2879063b13c759922c8cff3013893829bca containerd-fuse-overlayfs-2.1.6-linux-riscv64.tar.gz
6+
3c022651cdaff666e88996d5d9c7e776bf59419a03d7d718a28aa708036419f9 containerd-fuse-overlayfs-2.1.6-linux-s390x.tar.gz

0 commit comments

Comments
 (0)