From fab94808f55f3ce55ce00b742900519e23f37f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Thu, 20 Mar 2025 19:34:52 +0100 Subject: [PATCH] integration-cli: Update default CLI version to v18.06.3-ce MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This updates the Docker CLI version used for integration-cli tests from v17.06.2-ce to v18.06.3-ce. v18.06 is the first one that supports enabling BuildKit. Signed-off-by: Paweł Gronowski --- Dockerfile | 2 +- hack/dockerfile/install/dockercli.installer | 2 +- integration-cli/docker_cli_build_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index dfd6fc2608..7975861521 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG DOCKERCLI_REPOSITORY="https://github.com/docker/cli.git" # 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 +ARG DOCKERCLI_INTEGRATION_VERSION=v18.06.3-ce # BUILDX_VERSION is the version of buildx to install in the dev container. ARG BUILDX_VERSION=0.20.1 ARG COMPOSE_VERSION=v2.33.1 diff --git a/hack/dockerfile/install/dockercli.installer b/hack/dockerfile/install/dockercli.installer index 6e26bf3181..7c6e265e58 100755 --- a/hack/dockerfile/install/dockercli.installer +++ b/hack/dockerfile/install/dockercli.installer @@ -1,7 +1,7 @@ #!/bin/sh : ${DOCKERCLI_CHANNEL:=stable} -: ${DOCKERCLI_VERSION:=17.06.2-ce} +: ${DOCKERCLI_VERSION:=18.06.3-ce} install_dockercli() { echo "Install docker/cli version $DOCKERCLI_VERSION from $DOCKERCLI_CHANNEL" diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 7aac687867..d1bcb0f66d 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -6255,7 +6255,7 @@ func (s *DockerCLIBuildSuite) TestBuildEmitsEvents(t *testing.T) { "--since", before.Format(time.RFC3339), ), cli.WithTimeout(time.Millisecond*300), - cli.WithEnvironmentVariables("DOCKER_API_VERSION=v1.46"), // FIXME(thaJeztah): integration-cli runs docker CLI 17.06; we're "upgrading" the API version to a version it doesn't support here ;) + cli.WithEnvironmentVariables("DOCKER_API_VERSION=v1.46"), // FIXME(thaJeztah): integration-cli runs docker CLI 18.06; we're "upgrading" the API version to a version it doesn't support here ;) ) stdout := cmd.Stdout()