Skip to content

Commit cffed37

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request #2885 from AkihiroSuda/prepare-v1.7.5
[release/1.7] Prepare v1.7.5
2 parents 7b5f7e0 + abd9784 commit cffed37

File tree

10 files changed

+97
-72
lines changed

10 files changed

+97
-72
lines changed

‎.github/workflows/test.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ jobs:
7777
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
7878
include:
7979
- ubuntu: 20.04
80-
containerd: v1.6.28
80+
containerd: v1.6.30
8181
- ubuntu: 20.04
82-
containerd: v1.7.13
82+
containerd: v1.7.14
8383
- ubuntu: 22.04
84-
containerd: v1.7.13
84+
containerd: v1.7.14
8585
- ubuntu: 22.04
8686
containerd: main
8787
env:
@@ -113,7 +113,7 @@ jobs:
113113
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
114114
include:
115115
- ubuntu: 22.04
116-
containerd: v1.7.13
116+
containerd: v1.7.14
117117
env:
118118
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
119119
CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -157,36 +157,36 @@ jobs:
157157
# ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
158158
include:
159159
- ubuntu: 20.04
160-
containerd: v1.6.28
160+
containerd: v1.6.30
161161
rootlesskit: v1.1.1
162162
target: test-integration-rootless
163163
- ubuntu: 20.04
164-
containerd: v1.7.13
165-
rootlesskit: v2.0.1
164+
containerd: v1.7.14
165+
rootlesskit: v2.0.2
166166
target: test-integration-rootless
167167
- ubuntu: 22.04
168-
containerd: v1.7.13
168+
containerd: v1.7.14
169169
rootlesskit: v1.1.1
170170
target: test-integration-rootless
171171
- ubuntu: 22.04
172172
containerd: main
173-
rootlesskit: v2.0.1
173+
rootlesskit: v2.0.2
174174
target: test-integration-rootless
175175
- ubuntu: 20.04
176-
containerd: v1.6.28
176+
containerd: v1.6.30
177177
rootlesskit: v1.1.1
178178
target: test-integration-rootless-port-slirp4netns
179179
- ubuntu: 20.04
180-
containerd: v1.7.13
181-
rootlesskit: v2.0.1
180+
containerd: v1.7.14
181+
rootlesskit: v2.0.2
182182
target: test-integration-rootless-port-slirp4netns
183183
- ubuntu: 22.04
184-
containerd: v1.7.13
184+
containerd: v1.7.14
185185
rootlesskit: v1.1.1
186186
target: test-integration-rootless-port-slirp4netns
187187
- ubuntu: 22.04
188188
containerd: main
189-
rootlesskit: v2.0.1
189+
rootlesskit: v2.0.2
190190
target: test-integration-rootless-port-slirp4netns
191191
env:
192192
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
@@ -276,15 +276,15 @@ jobs:
276276
- uses: actions/[email protected]
277277
with:
278278
repository: containerd/containerd
279-
ref: v1.7.13
279+
ref: v1.7.14
280280
path: containerd
281281
fetch-depth: 1
282282
- name: "Set up CNI"
283283
working-directory: containerd
284284
run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
285285
- name: "Set up containerd"
286286
env:
287-
ctrdVersion: 1.7.13
287+
ctrdVersion: 1.7.14
288288
run: powershell hack/configure-windows-ci.ps1
289289
# TODO: Run unit tests
290290
- name: "Run integration tests"

‎Dockerfile

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

2020
# Basic deps
21-
ARG CONTAINERD_VERSION=v1.7.13
21+
ARG CONTAINERD_VERSION=v1.7.14
2222
ARG RUNC_VERSION=v1.1.12
23-
ARG CNI_PLUGINS_VERSION=v1.4.0
23+
ARG CNI_PLUGINS_VERSION=v1.4.1
2424

2525
# Extra deps: Build
2626
ARG BUILDKIT_VERSION=v0.12.5
2727
# Extra deps: Lazy-pulling
2828
ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1
2929
# Extra deps: Encryption
30-
ARG IMGCRYPT_VERSION=v1.1.9
30+
ARG IMGCRYPT_VERSION=v1.1.10
3131
# Extra deps: Rootless
32-
ARG ROOTLESSKIT_VERSION=v2.0.1
33-
ARG SLIRP4NETNS_VERSION=v1.2.2
32+
ARG ROOTLESSKIT_VERSION=v2.0.2
33+
ARG SLIRP4NETNS_VERSION=v1.2.3
3434
# Extra deps: bypass4netns
3535
ARG BYPASS4NETNS_VERSION=v0.4.0
3636
# Extra deps: FUSE-OverlayFS
3737
ARG FUSE_OVERLAYFS_VERSION=v1.13
3838
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8
3939
# Extra deps: IPFS
40-
ARG KUBO_VERSION=v0.26.0
40+
ARG KUBO_VERSION=v0.27.0
4141
# Extra deps: Init
4242
ARG TINI_VERSION=v0.19.0
4343
# Extra deps: Debug

‎Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.0

-2
This file was deleted.

‎Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
1511f6c003ace805eafeb1132727791326283cff88a923d76329e1892bba7a10 cni-plugins-linux-amd64-v1.4.1.tgz
2+
72644e13557cda8a5b39baf97fc5e93d23fdf7baba7700000e7e9efd8bdf9234 cni-plugins-linux-arm64-v1.4.1.tgz

‎Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.1

-6
This file was deleted.

‎Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.2

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
4dafc86e1cbee2fbedac6822bf46e459d54ec998803d273f535b67a6e62edb30 rootlesskit-aarch64.tar.gz
2+
c633c5e7f84d3390c4ebe8102af0cd8bdecd1f10e9fc007036636ef94d95b449 rootlesskit-armv7l.tar.gz
3+
598a2c685cd383ba1abd3bf20a5c1bd55c283ceea1b3a9479c76f0fb96df75d5 rootlesskit-ppc64le.tar.gz
4+
af9bbb79de33b0b3f901b3848341ae4b05ca4e0838f103044f082aab91f3b7f5 rootlesskit-riscv64.tar.gz
5+
b1539a7f8059150f8dfdfc4de3a2714a199c09fdfe9c7670ce69824b8fdad7b9 rootlesskit-s390x.tar.gz
6+
a218beb65d243183d13024a8b18fc08543e238ef38d306166e8375bde0efd57c rootlesskit-x86_64.tar.gz

‎Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.2.2

-7
This file was deleted.

‎Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.2.3

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
5ccf6a6cabc312d33332709486ea90110f4608b8371954d6dc2a1ed865457f92 SOURCE_DATE_EPOCH
2+
289b0838f849da0d6d5de596e6c5010fbb134a2912d3cc32a0e2e2b759543278 slirp4netns-aarch64
3+
43db5430758edb8d095a0923dcbf2757a2fded9f22aa851d18aad9b82c245fb6 slirp4netns-armv7l
4+
fe565401ffefa1c4f1e6c141788405825ae5513e0bb1122bdfe6acdd00be9e71 slirp4netns-ppc64le
5+
cb9f92d496541b9ee2163bd64d522bf82a4136ccbbb01e3883be078a5e65af6f slirp4netns-riscv64
6+
09e68bd9707fdab67884256bea5ca09ae9057a4ebf3f8382e369602c7ae21734 slirp4netns-s390x
7+
2051ae25baba59c96f42bf2b7b7efa2eabb022e497b6c4b692b1428d2b2d1f5b slirp4netns-x86_64

‎go.mod

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/containerd/nerdctl
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/Masterminds/semver/v3 v3.2.1
@@ -10,8 +10,8 @@ require (
1010
github.com/compose-spec/compose-go v1.20.2
1111
github.com/containerd/accelerated-container-image v1.0.2
1212
github.com/containerd/cgroups/v3 v3.0.3
13-
github.com/containerd/console v1.0.3
14-
github.com/containerd/containerd v1.7.13
13+
github.com/containerd/console v1.0.4
14+
github.com/containerd/containerd v1.7.14
1515
github.com/containerd/continuity v0.4.3
1616
github.com/containerd/fifo v1.1.0
1717
github.com/containerd/go-cni v1.1.9
@@ -54,11 +54,11 @@ require (
5454
github.com/vishvananda/netns v0.0.4
5555
github.com/yuchanns/srslog v1.1.0
5656
go.uber.org/mock v0.4.0
57-
golang.org/x/crypto v0.18.0
57+
golang.org/x/crypto v0.19.0
5858
golang.org/x/net v0.20.0
5959
golang.org/x/sync v0.6.0
60-
golang.org/x/sys v0.16.0
61-
golang.org/x/term v0.16.0
60+
golang.org/x/sys v0.17.0
61+
golang.org/x/term v0.17.0
6262
golang.org/x/text v0.14.0
6363
gopkg.in/yaml.v3 v3.0.1
6464
gotest.tools/v3 v3.5.1
@@ -74,15 +74,15 @@ require (
7474
github.com/cilium/ebpf v0.11.0 // indirect
7575
github.com/containerd/cgroups v1.1.0 // indirect
7676
github.com/containerd/go-runc v1.0.0 // indirect
77-
github.com/containerd/ttrpc v1.2.2 // indirect
77+
github.com/containerd/ttrpc v1.2.3 // indirect
7878
github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 // indirect
7979
github.com/containers/ocicrypt v1.1.9 // indirect
8080
github.com/distribution/reference v0.5.0 // indirect
8181
github.com/djherbis/times v1.5.0 // indirect
8282
github.com/docker/docker-credential-helpers v0.7.0 // indirect
8383
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
8484
github.com/felixge/httpsnoop v1.0.3 // indirect
85-
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
85+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
8686
github.com/go-logr/logr v1.3.0 // indirect
8787
github.com/go-logr/stdr v1.2.2 // indirect
8888
github.com/godbus/dbus/v5 v5.1.0 // indirect
@@ -139,6 +139,6 @@ require (
139139
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
140140
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
141141
google.golang.org/grpc v1.59.0 // indirect
142-
google.golang.org/protobuf v1.31.0 // indirect
142+
google.golang.org/protobuf v1.33.0 // indirect
143143
lukechampine.com/blake3 v1.1.7 // indirect
144144
)

0 commit comments

Comments
 (0)