Skip to content

Commit 01429e9

Browse files
authored
Merge pull request #4227 from AkihiroSuda/dev
update RootlessKit (2.3.5), fuse-overlayfs (1.15), containerd-fuse-overlayfs (2.1.5), etc.
2 parents e94e9c6 + a80f95f commit 01429e9

File tree

8 files changed

+23
-19
lines changed

8 files changed

+23
-19
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ ARG STARGZ_SNAPSHOTTER_VERSION=v0.16.3@BINARY
2828
# Extra deps: Encryption
2929
ARG IMGCRYPT_VERSION=v2.0.1@c377ec98ff79ec9205eabf555ebd2ea784738c6c
3030
# Extra deps: Rootless
31-
ARG ROOTLESSKIT_VERSION=v2.3.4@BINARY
31+
ARG ROOTLESSKIT_VERSION=v2.3.5@BINARY
3232
ARG SLIRP4NETNS_VERSION=v1.3.2@BINARY
3333
# Extra deps: bypass4netns
3434
ARG BYPASS4NETNS_VERSION=v0.4.2@aa04bd3dcc48c6dae6d7327ba219bda8fe2a4634
3535
# Extra deps: FUSE-OverlayFS
36-
ARG FUSE_OVERLAYFS_VERSION=v1.14@BINARY
37-
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.2@BINARY
36+
ARG FUSE_OVERLAYFS_VERSION=v1.15@BINARY
37+
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.5@BINARY
3838
# Extra deps: Init
3939
ARG TINI_VERSION=v0.19.0@BINARY
4040
# Extra deps: Debug
@@ -47,7 +47,7 @@ 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=v1.12.1
50+
ARG GOTESTSUM_VERSION=v1.12.2
5151
ARG NYDUS_VERSION=v2.3.1
5252
ARG SOCI_SNAPSHOTTER_VERSION=0.9.0
5353
ARG KUBO_VERSION=v0.34.1

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

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+
acc149d60e2fad0cff480852c82f39bdaae2eb6faa265b2028c944ec572014f9 containerd-fuse-overlayfs-2.1.5-linux-amd64.tar.gz
2+
2c1c12a99ac16e6ad137c474517d04cc7864d26d9045f50f99a6d6e887b9c425 containerd-fuse-overlayfs-2.1.5-linux-arm-v7.tar.gz
3+
17759de9588cda1499877cc9587189eb24731ae41edda201087fd74658ddc127 containerd-fuse-overlayfs-2.1.5-linux-arm64.tar.gz
4+
ce0310573fd667a2fa348588b12f1867a1bad5befc79d7d39e6419a7d4687ea8 containerd-fuse-overlayfs-2.1.5-linux-ppc64le.tar.gz
5+
e9bbb9835346d8007a6429151eb7c7b23fa1f20b85aa6d20dd3702cb5a4c038a containerd-fuse-overlayfs-2.1.5-linux-riscv64.tar.gz
6+
c088a7eee9b75f0a759e52d1ae2c8d69d21265594070f41021a94523d1c7bab1 containerd-fuse-overlayfs-2.1.5-linux-s390x.tar.gz

Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.14

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
a62829baa7a7d39d0a9a784d51ebd528efe226192c0a86ba6667d0fcae9129c3 fuse-overlayfs-aarch64
2+
7ad67a810100bebf63c41fbb621df3d552531db94d600a94f5f701b1e9f8aa5a fuse-overlayfs-armv7l
3+
9778e1f0da1429469bcc65ea90a7504e63f0a258089b9bb1ae65105330e61808 fuse-overlayfs-ppc64le
4+
f7a2852983b3d0a8f15c31084c215b4965d5b62b9ce1014708283dd2dd909b28 fuse-overlayfs-riscv64
5+
89a410a67822002c20ff21d8a9e5353ebda00d3a2f79fd99f26fb47533e253a5 fuse-overlayfs-s390x
6+
1cd97f5ca7ac52fa192c94c1e605713cfb27d3dc417c0bef4dcfb9fb20e01e81 fuse-overlayfs-x86_64

Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.4

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+
478c14c3195bf989cd9a8e6bd129d227d5d88f1c11418967ffdc84a0072cc7a2 rootlesskit-aarch64.tar.gz
2+
0622e52952a848219b86b902c9bdb96e1ebe575a3015c05e7da02569e83b3a61 rootlesskit-armv7l.tar.gz
3+
b1ec12321c54860230c5d0bbbc6d651a746ac49bce7eeb36fd1ad1e0f0048d58 rootlesskit-ppc64le.tar.gz
4+
8ee59e518cdb5770afab49307b400f585598ed2c06b4ffc81f7c36fbeea422d6 rootlesskit-riscv64.tar.gz
5+
2a3198947cf322357106557c58a8d5f29a664961edf290ea305c94b03521f6c8 rootlesskit-s390x.tar.gz
6+
118208e25becd144ee7317c172fc9decce7b16174d5c1bbf80f1d1d0eacc6b5f rootlesskit-x86_64.tar.gz

hack/generate-release-note.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cat <<-EOX
2525
(To be documented)
2626
2727
## Compatible containerd versions
28-
This release of nerdctl is expected to be used with containerd v1.6, v1.7, or v2.0.
28+
This release of nerdctl is expected to be used with containerd v1.6, v1.7, v2.0, or v2.1.
2929
3030
## About the binaries
3131
- Minimal (\`${minimal_amd64tgz_basename}\`): nerdctl only

0 commit comments

Comments
 (0)