From 427c1361c534a841a13196bb2e2c29428a0920b4 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 24 Feb 2025 14:52:26 +0100 Subject: [PATCH] gha: add docker 28 to test matrix - set default to 28 - remove minor version from matrix; docker:dind images also provide a "docker:28-dind" which point to the latest minor version. - remove TODO for 19.03, which is really out of scope now. Signed-off-by: Sebastiaan van Stijn --- .github/workflows/e2e.yml | 9 ++++----- e2e/compose-env.yaml | 2 +- e2e/testdata/Dockerfile.connhelper-ssh | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index caecaea8f..dfa925186 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -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 diff --git a/e2e/compose-env.yaml b/e2e/compose-env.yaml index 7feb2a0a7..2173f0e66 100644 --- a/e2e/compose-env.yaml +++ b/e2e/compose-env.yaml @@ -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: diff --git a/e2e/testdata/Dockerfile.connhelper-ssh b/e2e/testdata/Dockerfile.connhelper-ssh index 12d5c69b7..ccbe66da0 100644 --- a/e2e/testdata/Dockerfile.connhelper-ssh +++ b/e2e/testdata/Dockerfile.connhelper-ssh @@ -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