From 9c92c07acf61a2c8f719dc68791e7ede11ff3e07 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 3 Feb 2024 13:50:18 +0100 Subject: [PATCH 1/2] Dockerfile: update dev-shell version of the cli to v25.0.2 Update the docker CLI that's available for debugging in the dev-shell to the v25 release. full diff: https://github.com/docker/cli/compare/v25.0.1...v25.0.2 Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1c0f9ddbeb..923828d069 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG XX_VERSION=1.2.1 ARG VPNKIT_VERSION=0.5.0 ARG DOCKERCLI_REPOSITORY="https://github.com/docker/cli.git" -ARG DOCKERCLI_VERSION=v25.0.1 +ARG DOCKERCLI_VERSION=v25.0.2 # cli version used for integration-cli tests ARG DOCKERCLI_INTEGRATION_REPOSITORY="https://github.com/docker/cli.git" ARG DOCKERCLI_INTEGRATION_VERSION=v17.06.2-ce From 10d6f5213a4242cb3a5bcad26466b3f32e6056ca Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 3 Feb 2024 13:51:49 +0100 Subject: [PATCH 2/2] Dockerfile: update docker compose to v2.24.5 Update the version of compose used in CI to the latest version. - full diff: https://github.com/docker/compose/compare/v2.24.3...v2.24.5 - release notes: https://github.com/docker/compose/releases/tag/v2.24.5 Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 923828d069..d6e9c10bb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG DOCKERCLI_VERSION=v25.0.2 ARG DOCKERCLI_INTEGRATION_REPOSITORY="https://github.com/docker/cli.git" ARG DOCKERCLI_INTEGRATION_VERSION=v17.06.2-ce ARG BUILDX_VERSION=0.12.1 -ARG COMPOSE_VERSION=v2.24.3 +ARG COMPOSE_VERSION=v2.24.5 ARG SYSTEMD="false" ARG DOCKER_STATIC=1