Merge pull request #5864 from thaJeztah/gha_bump_docker
gha: add docker 28 to test matrix
This commit is contained in:
9
.github/workflows/e2e.yml
vendored
9
.github/workflows/e2e.yml
vendored
@ -38,11 +38,10 @@ jobs:
|
||||
- alpine
|
||||
- debian
|
||||
engine-version:
|
||||
- 27.0 # latest
|
||||
- 26.1 # latest - 1
|
||||
- 23.0 # mirantis lts
|
||||
# TODO(krissetto) 19.03 needs a look, doesn't work ubuntu 22.04 (cgroup errors).
|
||||
# we could have a separate job that tests it against ubuntu 20.04
|
||||
- 28 # latest
|
||||
- 27 # latest - 1
|
||||
- 26 # github actions default
|
||||
- 23 # mirantis lts
|
||||
steps:
|
||||
-
|
||||
name: Checkout
|
||||
|
||||
@ -4,7 +4,7 @@ services:
|
||||
image: 'registry:2'
|
||||
|
||||
engine:
|
||||
image: 'docker:${ENGINE_VERSION:-26.1}-dind'
|
||||
image: 'docker:${ENGINE_VERSION:-28}-dind'
|
||||
privileged: true
|
||||
command: ['--insecure-registry=registry:5000']
|
||||
environment:
|
||||
|
||||
2
e2e/testdata/Dockerfile.connhelper-ssh
vendored
2
e2e/testdata/Dockerfile.connhelper-ssh
vendored
@ -2,7 +2,7 @@
|
||||
|
||||
# ENGINE_VERSION is the version of the (docker-in-docker) Docker Engine to
|
||||
# test against.
|
||||
ARG ENGINE_VERSION=26.1
|
||||
ARG ENGINE_VERSION=28
|
||||
|
||||
FROM docker:${ENGINE_VERSION}-dind
|
||||
|
||||
|
||||
Reference in New Issue
Block a user