Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines -44 to -45
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed this TODO as well as we won't be spending time on this

- 28 # latest
- 27 # latest - 1
- 26 # github actions default
- 23 # mirantis lts
steps:
-
name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion e2e/compose-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/Dockerfile.connhelper-ssh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading