Skip to content

Commit a0bbfd7

Browse files
authored
Merge pull request #2047 from AkihiroSuda/dev
update containerd (1.6.19), BuildKit (0.11.3), Kubo (0.18.1)
2 parents 304919d + 52532dc commit a0bbfd7

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ windows_task:
3030
matrix:
3131
- name: "Windows/containerd-1.6"
3232
env:
33-
ctrdVersion: 1.6.16
33+
ctrdVersion: 1.6.19
3434
env:
3535
CGO_ENABLED: 0
3636
build_script:

.github/workflows/test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ jobs:
7676
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
7777
include:
7878
- ubuntu: 20.04
79-
containerd: v1.5.17
79+
containerd: v1.5.18
8080
- ubuntu: 20.04
81-
containerd: v1.6.16
81+
containerd: v1.6.19
8282
- ubuntu: 22.04
83-
containerd: v1.6.16
83+
containerd: v1.6.19
8484
- ubuntu: 22.04
8585
containerd: main
8686
env:
@@ -112,25 +112,25 @@ jobs:
112112
# ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
113113
include:
114114
- ubuntu: 20.04
115-
containerd: v1.5.17
115+
containerd: v1.5.18
116116
target: test-integration-rootless
117117
- ubuntu: 20.04
118-
containerd: v1.6.16
118+
containerd: v1.6.19
119119
target: test-integration-rootless
120120
- ubuntu: 22.04
121-
containerd: v1.6.16
121+
containerd: v1.6.19
122122
target: test-integration-rootless
123123
- ubuntu: 22.04
124124
containerd: main
125125
target: test-integration-rootless
126126
- ubuntu: 20.04
127-
containerd: v1.5.17
127+
containerd: v1.5.18
128128
target: test-integration-rootless-port-slirp4netns
129129
- ubuntu: 20.04
130-
containerd: v1.6.16
130+
containerd: v1.6.19
131131
target: test-integration-rootless-port-slirp4netns
132132
- ubuntu: 22.04
133-
containerd: v1.6.16
133+
containerd: v1.6.19
134134
target: test-integration-rootless-port-slirp4netns
135135
- ubuntu: 22.04
136136
containerd: main

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
# TODO: verify commit hash
1919

2020
# Basic deps
21-
ARG CONTAINERD_VERSION=v1.6.16
21+
ARG CONTAINERD_VERSION=v1.6.19
2222
ARG RUNC_VERSION=v1.1.4
2323
ARG CNI_PLUGINS_VERSION=v1.2.0
2424

2525
# Extra deps: Build
26-
ARG BUILDKIT_VERSION=v0.11.2
26+
ARG BUILDKIT_VERSION=v0.11.3
2727
# Extra deps: Lazy-pulling
2828
ARG STARGZ_SNAPSHOTTER_VERSION=v0.14.1
2929
# Extra deps: Nydus Lazy-pulling
30-
ARG NYDUS_VERSION=v2.1.3
30+
ARG NYDUS_VERSION=v2.1.4
3131
# Extra deps: Encryption
3232
ARG IMGCRYPT_VERSION=v1.1.7
3333
# Extra deps: Rootless
@@ -39,7 +39,7 @@ ARG BYPASS4NETNS_VERSION=v0.3.0
3939
ARG FUSE_OVERLAYFS_VERSION=v1.10
4040
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.5
4141
# Extra deps: IPFS
42-
ARG KUBO_VERSION=v0.18.0
42+
ARG KUBO_VERSION=v0.18.1
4343
# Extra deps: Init
4444
ARG TINI_VERSION=v0.19.0
4545
# Extra deps: Debug

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

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+
f631978dc283670500a602df1ba1a49333af137c0792716c5510d3cbb9cb4ede buildkit-v0.11.3.linux-amd64.tar.gz
2+
3425ebba8ff0748e2a26dc9f45a879a03bde0937c6acbbc8e6659b905d014f07 buildkit-v0.11.3.linux-arm64.tar.gz

Dockerfile.d/SHA256SUMS.d/kubo-v0.18.0

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# From https://github.com/ipfs/kubo/releases
2+
15d42b47b8529edda3e8e2d6fe6c14958d939c4efd07dea02e204743e05216f3 kubo_v0.18.1_linux-amd64.tar.gz
3+
9c2e0d7ad3341a0769db421197d37cba38ef2fec67fac39e05d4052cf0feb3cd kubo_v0.18.1_linux-arm64.tar.gz

0 commit comments

Comments
 (0)