Skip to content

Commit 111468c

Browse files
authored
Merge pull request #5864 from thaJeztah/gha_bump_docker
gha: add docker 28 to test matrix
2 parents 656523e + 427c136 commit 111468c

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/workflows/e2e.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@ jobs:
3838
- alpine
3939
- debian
4040
engine-version:
41-
- 27.0 # latest
42-
- 26.1 # latest - 1
43-
- 23.0 # mirantis lts
44-
# TODO(krissetto) 19.03 needs a look, doesn't work ubuntu 22.04 (cgroup errors).
45-
# we could have a separate job that tests it against ubuntu 20.04
41+
- 28 # latest
42+
- 27 # latest - 1
43+
- 26 # github actions default
44+
- 23 # mirantis lts
4645
steps:
4746
-
4847
name: Checkout

e2e/compose-env.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
image: 'registry:2'
55

66
engine:
7-
image: 'docker:${ENGINE_VERSION:-26.1}-dind'
7+
image: 'docker:${ENGINE_VERSION:-28}-dind'
88
privileged: true
99
command: ['--insecure-registry=registry:5000']
1010
environment:

e2e/testdata/Dockerfile.connhelper-ssh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# ENGINE_VERSION is the version of the (docker-in-docker) Docker Engine to
44
# test against.
5-
ARG ENGINE_VERSION=26.1
5+
ARG ENGINE_VERSION=28
66

77
FROM docker:${ENGINE_VERSION}-dind
88

0 commit comments

Comments
 (0)