Skip to content

Commit d2164ac

Browse files
authored
Merge pull request #4489 from AkihiroSuda/remove-containerd-1.6
CI: remove containerd v1.6 as it reached EOL
2 parents 9652e4e + ec3ffd5 commit d2164ac

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/workflows/workflow-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- runner: ubuntu-24.04-arm
4949
# Additionally build for old containerd on amd
5050
- runner: ubuntu-24.04
51-
containerd-version: v1.6.38
51+
containerd-version: v1.7.28
5252
with:
5353
runner: ${{ matrix.runner }}
5454
containerd-version: ${{ matrix.containerd-version }}
@@ -75,7 +75,7 @@ jobs:
7575
# old containerd + old ubuntu + old rootlesskit
7676
- runner: ubuntu-22.04
7777
target: rootless
78-
containerd-version: v1.6.38
78+
containerd-version: v1.7.28
7979
rootlesskit-version: v1.1.1
8080
# gomodjail
8181
- runner: ubuntu-24.04
@@ -91,7 +91,7 @@ jobs:
9191
# old containerd + old ubuntu
9292
- runner: ubuntu-22.04
9393
target: rootful
94-
containerd-version: v1.6.38
94+
containerd-version: v1.7.28
9595
# ipv6
9696
- runner: ubuntu-24.04
9797
target: rootful

docs/dev/auditing_dockerfile.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ ci_run(){
103103
local no_cache="${1:-}"
104104
export UBUNTU_VERSION=24.04
105105

106-
CONTAINERD_VERSION=v1.6.36 run "$no_cache" arm64 Dockerfile.origin build-dependencies
107-
UBUNTU_VERSION=20.04 CONTAINERD_VERSION=v1.6.36 run "" arm64 Dockerfile.origin test-integration
108-
106+
# The actual version may differ
109107
CONTAINERD_VERSION=v1.7.25 run "$no_cache" arm64 Dockerfile.origin build-dependencies
110108
UBUNTU_VERSION=22.04 CONTAINERD_VERSION=v1.7.25 run "" arm64 Dockerfile.origin test-integration
111109

hack/generate-release-note.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ 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, v2.0, or v2.1.
28+
This release of nerdctl is expected to be used with containerd v1.7, v2.0, or v2.1.
29+
Some features may not work with other releases of containerd.
2930
3031
## About the binaries
3132
- Minimal (\`${minimal_amd64tgz_basename}\`): nerdctl only

0 commit comments

Comments
 (0)