Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5076 from krissetto/update-e2e-engine-version 

Updated engine versions used in e2e tests
This commit is contained in:
Christopher Petito 2024-05-16 13:57:34 +02:00 committed by GitHub
parent 0937c8b926 ffd57fac12
commit 28c5652a09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/e2e.yml vendored
View File

@ -28,8 +28,8 @@ jobs:
- alpine - alpine
- debian - debian
engine-version: engine-version:
- 25.0 # latest - 26.1 # latest
- 24.0 # latest - 1 - 25.0 # latest - 1
- 23.0 # mirantis lts - 23.0 # mirantis lts
# TODO(krissetto) 19.03 needs a look, doesn't work ubuntu 22.04 (cgroup errors). # 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 # we could have a separate job that tests it against ubuntu 20.04

2
e2e/compose-env.yaml
View File

@ -4,7 +4,7 @@ services:
image: 'registry:2' image: 'registry:2'
engine: engine:
image: 'docker:${ENGINE_VERSION:-25.0}-dind' image: 'docker:${ENGINE_VERSION:-26.1}-dind'
privileged: true privileged: true
command: ['--insecure-registry=registry:5000'] command: ['--insecure-registry=registry:5000']
environment: environment:

2
e2e/testdata/Dockerfile.connhelper-ssh vendored
View File

@ -2,7 +2,7 @@
# ENGINE_VERSION is the version of the (docker-in-docker) Docker Engine to # ENGINE_VERSION is the version of the (docker-in-docker) Docker Engine to
# test against. # test against.
ARG ENGINE_VERSION=25.0 ARG ENGINE_VERSION=26.1
FROM docker:${ENGINE_VERSION}-dind FROM docker:${ENGINE_VERSION}-dind