From e419e22f29090d06b7cacd62c4ca47b89b61bcf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 26 Jun 2024 21:01:24 +0200 Subject: [PATCH 1/2] Dockerfile: update compose to v2.28.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the compose cli plugin used in the dev-container full diff: https://github.com/docker/cli/compare/v2.27.1...v2.28.1 Signed-off-by: Paweł Gronowski (cherry picked from commit 790035f754c3f668032de614d6ab1a6db2bd63da) Signed-off-by: Paweł Gronowski --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index be2d1e9e94..09a0b80726 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG DOCKERCLI_VERSION=v26.1.0 ARG DOCKERCLI_INTEGRATION_REPOSITORY="https://github.com/docker/cli.git" ARG DOCKERCLI_INTEGRATION_VERSION=v17.06.2-ce ARG BUILDX_VERSION=0.15.1 -ARG COMPOSE_VERSION=v2.27.1 +ARG COMPOSE_VERSION=v2.28.1 ARG SYSTEMD="false" ARG DOCKER_STATIC=1 From 838330bac3da1006063ee2ff94c65a5ed51595f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 26 Jun 2024 21:01:37 +0200 Subject: [PATCH 2/2] Dockerfile: update docker CLI to v27.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the Docker CLI used in the dev-container full diff: https://github.com/docker/cli/compare/v26.1.0...v27.0.2 Signed-off-by: Paweł Gronowski (cherry picked from commit 3928165cf702c3ccf904495b999a0d0cf07753bd) Signed-off-by: Paweł Gronowski --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 09a0b80726..3049a6881b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG XX_VERSION=1.4.0 ARG VPNKIT_VERSION=0.5.0 ARG DOCKERCLI_REPOSITORY="https://github.com/docker/cli.git" -ARG DOCKERCLI_VERSION=v26.1.0 +ARG DOCKERCLI_VERSION=v27.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