Skip to content

Commit ce61fc4

Browse files
authored
Merge pull request #3826 from AkihiroSuda/dev
update containerd (2.0.2), RootlessKit (2.3.2), bypass4netns (0.4.2), containerd-fuse-overlayfs (2.1.1), BuildKit (0.19.0)
2 parents 587ae99 + cb7fc0d commit ce61fc4

8 files changed

+29
-29
lines changed

.github/workflows/test.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
containerd: v1.7.25
3232
arch: amd64
3333
- runner: ubuntu-24.04
34-
containerd: v2.0.1
34+
containerd: v2.0.2
3535
arch: amd64
3636
- runner: arm64-8core-32gb
37-
containerd: v2.0.1
37+
containerd: v2.0.2
3838
arch: arm64
3939
env:
4040
CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -113,11 +113,11 @@ jobs:
113113
runner: "ubuntu-22.04"
114114
arch: amd64
115115
- ubuntu: 24.04
116-
containerd: v2.0.1
116+
containerd: v2.0.2
117117
runner: "ubuntu-24.04"
118118
arch: amd64
119119
- ubuntu: 24.04
120-
containerd: v2.0.1
120+
containerd: v2.0.2
121121
runner: arm64-8core-32gb
122122
arch: arm64
123123
env:
@@ -167,7 +167,7 @@ jobs:
167167
matrix:
168168
include:
169169
- ubuntu: 24.04
170-
containerd: v2.0.1
170+
containerd: v2.0.2
171171
arch: amd64
172172
env:
173173
CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -235,17 +235,17 @@ jobs:
235235
arch: amd64
236236
- ubuntu: 22.04
237237
containerd: v1.7.25
238-
rootlesskit: v2.3.1
238+
rootlesskit: v2.3.2
239239
target: rootless
240240
arch: amd64
241241
- ubuntu: 24.04
242-
containerd: v2.0.1
243-
rootlesskit: v2.3.1
242+
containerd: v2.0.2
243+
rootlesskit: v2.3.2
244244
target: rootless
245245
arch: amd64
246246
- ubuntu: 24.04
247247
containerd: v1.7.25
248-
rootlesskit: v2.3.1
248+
rootlesskit: v2.3.2
249249
target: rootless-port-slirp4netns
250250
arch: amd64
251251
env:
@@ -403,7 +403,7 @@ jobs:
403403
key: vagrant-${{ matrix.box }}
404404
- name: Set up vagrant
405405
run: |
406-
# from https://github.com/containerd/containerd/blob/v2.0.1/.github/workflows/ci.yml#L583-L596
406+
# from https://github.com/containerd/containerd/blob/v2.0.2/.github/workflows/ci.yml#L583-L596
407407
# which is based on https://github.com/opencontainers/runc/blob/v1.1.8/.cirrus.yml#L41-L49
408408
curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
409409
echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list

Dockerfile

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

2020
# Basic deps
21-
ARG CONTAINERD_VERSION=v2.0.1
21+
ARG CONTAINERD_VERSION=v2.0.2
2222
ARG RUNC_VERSION=v1.2.4
2323
ARG CNI_PLUGINS_VERSION=v1.6.2
2424

2525
# Extra deps: Build
26-
ARG BUILDKIT_VERSION=v0.18.2
26+
ARG BUILDKIT_VERSION=v0.19.0
2727
# Extra deps: Lazy-pulling
2828
ARG STARGZ_SNAPSHOTTER_VERSION=v0.16.3
2929
# Extra deps: Encryption
3030
ARG IMGCRYPT_VERSION=v2.0.0
3131
# Extra deps: Rootless
32-
ARG ROOTLESSKIT_VERSION=v2.3.1
32+
ARG ROOTLESSKIT_VERSION=v2.3.2
3333
ARG SLIRP4NETNS_VERSION=v1.3.1
3434
# Extra deps: bypass4netns
35-
ARG BYPASS4NETNS_VERSION=v0.4.1
35+
ARG BYPASS4NETNS_VERSION=v0.4.2
3636
# Extra deps: FUSE-OverlayFS
3737
ARG FUSE_OVERLAYFS_VERSION=v1.14
38-
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.0
38+
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.1
3939
# Extra deps: Init
4040
ARG TINI_VERSION=v0.19.0
4141
# Extra deps: Debug

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

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
9993fdd8b454e541ac14a1adf4bf53d271dbc8f3aafde45894bf689604a0a5cf buildkit-v0.19.0.linux-amd64.tar.gz
2+
be7f7922d8f5eea02704cd707fb62b5a18e272452243804601b523ae6bef0ef5 buildkit-v0.19.0.linux-arm64.tar.gz

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

-6
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2061a4064d163544f69e36fe56d008ab90f791906d5a96bddf87d3151fdde836 containerd-fuse-overlayfs-2.1.1-linux-amd64.tar.gz
2+
99d08b0f41ede108f36efb9b5d8e0613be69336785cf97a73074487b52d9e71e containerd-fuse-overlayfs-2.1.1-linux-arm-v7.tar.gz
3+
2219bf91d943480ce7021d6fce956379050757a500d36540b4372d45616c74eb containerd-fuse-overlayfs-2.1.1-linux-arm64.tar.gz
4+
a2515f00553334b23470d52b088e49c3aa69aa9d66163dc14f188684bc8c774d containerd-fuse-overlayfs-2.1.1-linux-ppc64le.tar.gz
5+
ae0fc07af2d34fb4c599364f82570ec43fed07f1892e493726f5414ecf8c8908 containerd-fuse-overlayfs-2.1.1-linux-riscv64.tar.gz
6+
1200244a100b2433cc98a7ec8a0138073e9ad1c5e11ed503f5d2b3063dd40197 containerd-fuse-overlayfs-2.1.1-linux-s390x.tar.gz

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

-6
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
0a4ed18c6794bfe5821cc6548f52b26b3b2296170f05df194c2073545200d968 rootlesskit-aarch64.tar.gz
2+
f9faaf3b91e02764eb8308c7a7da7de55311de9fea665ca1b2632421b9286bcc rootlesskit-armv7l.tar.gz
3+
fc1120af52071dc2a6984eec8dfc74f5d973fb28fa6c6d7ec77523a636ebf641 rootlesskit-ppc64le.tar.gz
4+
acc1d39483df101bfa204c8dbf61d2e7ac85b246b3e9c606dabeaaeededd0130 rootlesskit-riscv64.tar.gz
5+
9e1c29b1b82162a71d435edf80898adcb5a41c0ec51202c36856276689eb7b52 rootlesskit-s390x.tar.gz
6+
5d402d7995f1e2c369240de3c6f8eb4cc2a3d1f0f4877ac5362044b2e83962e9 rootlesskit-x86_64.tar.gz

0 commit comments

Comments
 (0)