Merge pull request moby#51187 from thaJeztah/bump_test_cli

Dockerfile: update integration-cli CLI to v25.0.5

Author: vvoland

Dockerfile

@@ -18,7 +18,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=v18.06.3-ce
+ARG DOCKERCLI_INTEGRATION_VERSION=v25.0.5
 
 # BUILDX_VERSION is the version of buildx to install in the dev container.
 ARG BUILDX_VERSION=0.29.1

daemon/container_operations.go

@@ -533,7 +533,7 @@ func validateEndpointSettings(nw *libnetwork.Network, nwName string, epConfig *n
 			errs = append(errs, cerrdefs.ErrInvalidArgument.WithMessage("user specified IP address is supported on user defined networks only"))
 		}
 		if len(epConfig.Aliases) > 0 && !serviceDiscoveryOnDefaultNetwork() {
-			errs = append(errs, cerrdefs.ErrInvalidArgument.WithMessage("network-scoped alias is supported only for containers in user defined networks"))
+			errs = append(errs, cerrdefs.ErrInvalidArgument.WithMessage("network-scoped aliases are only supported for user-defined networks"))
 		}
 	}
 

hack/make.ps1

@@ -513,7 +513,7 @@ Try {
         if ($Client) {
             # Get the Docker channel and version from the environment, or use the defaults.
             if (-not ($channel = $env:DOCKERCLI_CHANNEL)) { $channel = "stable" }
-            if (-not ($version = $env:DOCKERCLI_VERSION)) { $version = "17.06.2-ce" }
+            if (-not ($version = $env:DOCKERCLI_VERSION)) { $version = "25.0.5" }
 
             # Download the zip file and extract the client executable.
             Write-Host "INFO: Downloading docker/cli version $version from $channel..."

integration-cli/docker_cli_build_test.go

@@ -39,6 +39,11 @@ type DockerCLIBuildSuite struct {
 	ds *DockerSuite
 }
 
+func (s *DockerCLIBuildSuite) SetUpTest(_ context.Context, t *testing.T) {
+	// This test-suite is for the classic builder.
+	t.Setenv("DOCKER_BUILDKIT", "0")
+}
+
 func (s *DockerCLIBuildSuite) TearDownTest(ctx context.Context, t *testing.T) {
 	s.ds.TearDownTest(ctx, t)
 }
@@ -3402,6 +3407,8 @@ func (s *DockerCLIBuildSuite) TestBuildLabelsCache(c *testing.T) {
 
 // FIXME(vdemeester) port to docker/cli e2e tests (api tests should test suppressOutput option though)
 func (s *DockerCLIBuildSuite) TestBuildNotVerboseSuccess(c *testing.T) {
+	c.Skip("FIXME: test breaks due to classic builder deprecation message") // FIXME(thaJeztah): test breaks due to classic builder deprecation message in output
+
 	// This test makes sure that -q works correctly when build is successful:
 	// stdout has only the image ID (long image ID) and stderr is empty.
 	outRegexp := regexp.MustCompile(`^(sha256:|)[a-z0-9]{64}\n$`)
@@ -3452,6 +3459,8 @@ func (s *DockerCLIBuildSuite) TestBuildNotVerboseSuccess(c *testing.T) {
 
 // FIXME(vdemeester) migrate to docker/cli tests
 func (s *DockerCLIBuildSuite) TestBuildNotVerboseFailureWithNonExistImage(c *testing.T) {
+	c.Skip("FIXME: test breaks due to classic builder deprecation message") // FIXME(thaJeztah): test breaks due to classic builder deprecation message in output
+
 	// This test makes sure that -q works correctly when build fails by
 	// comparing between the stderr output in quiet mode and in stdout
 	// and stderr output in verbose mode
@@ -3473,6 +3482,8 @@ func (s *DockerCLIBuildSuite) TestBuildNotVerboseFailureWithNonExistImage(c *tes
 
 // FIXME(vdemeester) migrate to docker/cli tests
 func (s *DockerCLIBuildSuite) TestBuildNotVerboseFailure(c *testing.T) {
+	c.Skip("FIXME: test breaks due to classic builder deprecation message") // FIXME(thaJeztah): test breaks due to classic builder deprecation message in output
+
 	// This test makes sure that -q works correctly when build fails by
 	// comparing between the stderr output in quiet mode and in stdout
 	// and stderr output in verbose mode
@@ -3501,6 +3512,8 @@ func (s *DockerCLIBuildSuite) TestBuildNotVerboseFailure(c *testing.T) {
 
 // FIXME(vdemeester) migrate to docker/cli tests
 func (s *DockerCLIBuildSuite) TestBuildNotVerboseFailureRemote(c *testing.T) {
+	c.Skip("FIXME: test breaks due to classic builder deprecation message") // FIXME(thaJeztah): test breaks due to classic builder deprecation message in output
+
 	// This test ensures that when given a wrong URL, stderr in quiet mode and
 	// stderr in verbose mode are identical.
 	// TODO(vdemeester) with cobra, stdout has a carriage return too much so this test should not check stdout
@@ -3531,6 +3544,8 @@ func (s *DockerCLIBuildSuite) TestBuildNotVerboseFailureRemote(c *testing.T) {
 
 // FIXME(vdemeester) migrate to docker/cli tests
 func (s *DockerCLIBuildSuite) TestBuildStderr(c *testing.T) {
+	c.Skip("FIXME: test breaks due to classic builder deprecation message") // FIXME(thaJeztah): test breaks due to classic builder deprecation message in output
+
 	// This test just makes sure that no non-error output goes
 	// to stderr
 	const name = "testbuildstderr"
@@ -3700,6 +3715,7 @@ func (s *DockerCLIBuildSuite) TestBuildFromMixedcaseDockerfile(c *testing.T) {
 
 // FIXME(vdemeester) should migrate to docker/cli tests
 func (s *DockerCLIBuildSuite) TestBuildFromURLWithF(c *testing.T) {
+	c.Skip("FIXME(thaJeztah): test is broken or invalid on current versions") // FIXME(thaJeztah) produces "ambiguous Dockerfile source: both stdin and flag correspond to Dockerfiles"
 	server := fakestorage.New(c, "", fakecontext.WithFiles(map[string]string{"baz": `FROM busybox
 RUN echo from baz
 COPY * /tmp/
@@ -3726,7 +3742,9 @@ RUN find /tmp/`}))
 
 // FIXME(vdemeester) should migrate to docker/cli tests
 func (s *DockerCLIBuildSuite) TestBuildFromStdinWithF(c *testing.T) {
-	testRequires(c, DaemonIsLinux) // TODO Windows: This test is flaky; no idea why
+	testRequires(c, DaemonIsLinux)                                            // TODO Windows: This test is flaky; no idea why
+	c.Skip("FIXME(thaJeztah): test is broken or invalid on current versions") // FIXME(thaJeztah) produces "ambiguous Dockerfile source: both stdin and flag correspond to Dockerfiles"
+
 	ctx := fakecontext.New(c, "", fakecontext.WithDockerfile(`FROM busybox
 RUN echo "from Dockerfile"`))
 	defer ctx.Close()
@@ -6250,7 +6268,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 18.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 25.0; we're "upgrading" the API version to a version it doesn't support here ;)
 				)
 
 				tc.check(t, cmd.Stdout())

integration-cli/docker_cli_build_unix_test.go

@@ -33,7 +33,18 @@ func (s *DockerCLIBuildSuite) TestBuildResourceConstraintsAreUsed(c *testing.T)
 	RUN ["/hello"]
 	`))
 	cli.Docker(
-		cli.Args("build", "--no-cache", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=0", "--cpuset-mems=0", "--cpu-shares=100", "--cpu-quota=8000", "--ulimit", "nofile=42", "--label="+buildLabel, "-t", name, "."),
+		cli.Args("build",
+			"--no-cache",
+			"--rm=false",
+			"--memory=64m",
+			"--memory-swap=-1",
+			"--cpuset-cpus=0",
+			"--cpuset-mems=0",
+			"--cpu-shares=100",
+			"--cpu-quota=8000",
+			"--ulimit", "nofile=42",
+			"--label="+buildLabel,
+			"-t", name, "."),
 		cli.InDir(ctx.Dir),
 	).Assert(c, icmd.Success)
 
@@ -80,7 +91,7 @@ func (s *DockerCLIBuildSuite) TestBuildResourceConstraintsAreUsed(c *testing.T)
 	assert.Assert(c, c2.CpusetMems != "0", "resource leaked from build for CpusetMems")
 	assert.Assert(c, c2.CPUShares != int64(100), "resource leaked from build for CPUShares")
 	assert.Assert(c, c2.CPUQuota != int64(8000), "resource leaked from build for CPUQuota")
-	assert.Assert(c, c2.Ulimits == nil, "resource leaked from build for Ulimits")
+	assert.Assert(c, len(c2.Ulimits) == 0, "resource leaked from build for Ulimits")
 }
 
 func (s *DockerCLIBuildSuite) TestBuildAddChangeOwnership(c *testing.T) {

integration-cli/docker_cli_by_digest_test.go

@@ -405,7 +405,9 @@ func (s *DockerRegistrySuite) TestPsListContainersFilterAncestorImageByDigest(t
 	const imageName1 = "images_ps_filter_test"
 	cli.BuildCmd(t, imageName1, build.WithDockerfile(fmt.Sprintf(
 		`FROM %s
-		 LABEL match me 1`, imageReference)))
+		 LABEL match me 1`, imageReference)),
+		build.WithBuildkit(false), // FIXME(thaJeztah): rewrite test to have something more predictable
+	)
 
 	// run a container based on that
 	cli.DockerCmd(t, "run", "--name=test1", imageReference, "echo", "hello")

integration-cli/docker_cli_daemon_test.go

@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/cloudflare/cfssl/helpers"
+	cerrdefs "github.com/containerd/errdefs"
 	"github.com/creack/pty"
 	"github.com/moby/moby/client"
 	"github.com/moby/moby/v2/daemon/pkg/opts"
@@ -361,9 +362,10 @@ func (s *DockerDaemonSuite) TestDaemonExitOnFailure(c *testing.T) {
 }
 
 func (s *DockerDaemonSuite) TestDaemonBridgeNone(c *testing.T) {
+	ctx := testutil.GetContext(c)
 	// start with bridge none
 	d := s.d
-	d.StartWithBusybox(testutil.GetContext(c), c, "--bridge", "none")
+	d.StartWithBusybox(ctx, c, "--bridge", "none")
 	defer d.Restart(c)
 
 	// verify docker0 iface is not there
@@ -374,9 +376,9 @@ func (s *DockerDaemonSuite) TestDaemonBridgeNone(c *testing.T) {
 	})
 
 	// verify default "bridge" network is not there
-	out, err := d.Cmd("network", "inspect", "bridge")
-	assert.ErrorContains(c, err, "", `"bridge" network should not be present if daemon started with --bridge=none`)
-	assert.Assert(c, is.Contains(out, "No such network"))
+	apiClient := d.NewClientT(c)
+	_, err := apiClient.NetworkInspect(ctx, "bridge", client.NetworkInspectOptions{})
+	assert.ErrorType(c, err, cerrdefs.IsNotFound, `"bridge" network should not be present if daemon started with --bridge=none`)
 }
 
 func createInterface(t *testing.T, ifType string, ifName string, ipNet string) {
@@ -725,9 +727,10 @@ func (s *DockerDaemonSuite) TestHTTPSInfoRogueCert(c *testing.T) {
 		// > the case if the server rejects the client certificate.
 		//
 		// https://github.com/golang/go/blob/go1.25.1/src/crypto/tls/alert.go#L71-L72
-		alertBadCertificate   = "bad certificate"   // go1.24 / TLS 1.2
-		alertHandshakeFailure = "handshake failure" // go1.25 / TLS 1.3
-		testDaemonHTTPSAddr   = "tcp://localhost:4271"
+		alertBadCertificate      = "bad certificate"   // go1.24 / TLS 1.2
+		alertHandshakeFailure    = "handshake failure" // go1.25 / TLS 1.3
+		alertCertificateRequired = "certificate required"
+		testDaemonHTTPSAddr      = "tcp://localhost:4271"
 	)
 
 	s.d.Start(c,
@@ -749,8 +752,8 @@ func (s *DockerDaemonSuite) TestHTTPSInfoRogueCert(c *testing.T) {
 	if err == nil {
 		c.Errorf("Expected an error, but got none; output: %s", out)
 	}
-	if !strings.Contains(out, alertHandshakeFailure) && !strings.Contains(out, alertBadCertificate) {
-		c.Errorf("Expected %q or %q; output: %s", alertHandshakeFailure, alertBadCertificate, out)
+	if !strings.Contains(out, alertHandshakeFailure) && !strings.Contains(out, alertBadCertificate) && !strings.Contains(out, alertCertificateRequired) {
+		c.Errorf("Expected %q, %q, or %q; output: %s", alertHandshakeFailure, alertBadCertificate, alertCertificateRequired, out)
 	}
 }
 
@@ -1629,6 +1632,7 @@ func (s *DockerDaemonSuite) TestBuildOnDisabledBridgeNetworkDaemon(c *testing.T)
         FROM busybox
         RUN cat /etc/hosts`),
 		build.WithoutCache,
+		build.WithBuildkit(false), // FIXME(thaJeztah): doesn't work with BuildKit? 'ERROR: process "/bin/sh -c cat /etc/hosts" did not complete successfully: network bridge not found'
 	)
 	comment := fmt.Sprintf("Failed to build image. output %s, exitCode %d, err %v", result.Combined(), result.ExitCode, result.Error)
 	assert.Assert(c, result.Error == nil, comment)

integration-cli/docker_cli_events_test.go

@@ -553,7 +553,6 @@ func (s *DockerRegistrySuite) TestEventsImageFilterPush(c *testing.T) {
 }
 
 func (s *DockerCLIEventSuite) TestEventsFilterType(c *testing.T) {
-	// FIXME(vdemeester) fails on e2e run
 	testRequires(c, testEnv.IsLocalDaemon)
 	since := daemonUnixTime(c)
 	name := "labelfiltertest"
@@ -589,12 +588,12 @@ func (s *DockerCLIEventSuite) TestEventsFilterType(c *testing.T) {
 		"--since", since,
 		"--until", daemonUnixTime(c),
 		"--filter", fmt.Sprintf("label=%s", label),
-		"--filter", "type=container",
+		"--filter", "type=build",
 	).Stdout()
 	events = strings.Split(strings.TrimSpace(out), "\n")
 
-	// Events generated by the container that builds the image
-	assert.Equal(c, len(events), 2, "Events == %s", events)
+	// Events generated the build
+	assert.Equal(c, len(events), 1, "Events == %s", events)
 
 	out = cli.DockerCmd(c,
 		"events",

integration-cli/docker_cli_external_volume_driver_test.go

@@ -476,7 +476,7 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverList(c *testing.T) {
 func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverGet(c *testing.T) {
 	out, _, err := dockerCmdWithError("volume", "inspect", "dummy")
 	assert.ErrorContains(c, err, "", out)
-	assert.Assert(c, is.Contains(out, "No such volume"))
+	assert.Assert(c, is.Contains(out, "no such volume"))
 	assert.Equal(c, s.ec.gets, 1)
 
 	cli.DockerCmd(c, "volume", "create", "test", "-d", volumePluginName)
@@ -514,7 +514,7 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverGetEmptyResponse(c *
 
 	out, err = s.d.Cmd("volume", "inspect", "abc2")
 	assert.ErrorContains(c, err, "", out)
-	assert.Assert(c, is.Contains(out, "No such volume"))
+	assert.Assert(c, is.Contains(out, "no such volume"))
 }
 
 // Ensure only cached paths are used in volume list to prevent N+1 calls to `VolumeDriver.Path`