[cherry-pick] vendor: Ensure service images get default tag and print familiar strings

[nishanttotla]

Cherry picking moby/moby#33279 into components/cli/vendor/github.com/docker/docker.

This is related to the changes in #13

cc @andrewhsu @mlaventure @thaJeztah

[andrewhsu]

Two errors with this PR which are reproducible:

00:06:40 FAIL: docker_cli_service_logs_test.go:24: DockerSwarmSuite.TestServiceLogs
00:06:40 
00:06:40 [d693c720905ab] waiting for daemon to start
00:06:40 [d693c720905ab] daemon started
00:06:40 
00:06:40 docker_cli_service_logs_test.go:43:
00:06:40     // make sure task has been deployed.
00:06:40     waitAndAssert(c, defaultReconciliationTimeout,
00:06:40         d.CheckRunningTaskImages, checker.DeepEquals,
00:06:40         map[string]int{"busybox": len(services)})
00:06:40 docker_utils_test.go:471:
00:06:40     c.Assert(v, checker, args...)
00:06:40 ... obtained map[string]int = map[string]int{"busybox:latest":2}
00:06:40 ... expected map[string]int = map[string]int{"busybox":2}

and

00:22:57 FAIL: docker_cli_swarm_unix_test.go:56: DockerSwarmSuite.TestSwarmNetworkPluginV2
00:22:57 
00:22:57 [d88ef2b0e0aea] waiting for daemon to start
00:22:57 [d88ef2b0e0aea] daemon started
00:22:57 
00:22:57 [d65246fc1d5e2] waiting for daemon to start
00:22:57 [d65246fc1d5e2] daemon started
00:22:57 
00:22:57 docker_cli_swarm_unix_test.go:103:
00:22:57     waitAndAssert(c, defaultReconciliationTimeout, d1.CheckRunningTaskImages, checker.DeepEquals,
00:22:57         map[string]int{image: 1})
00:22:57 docker_utils_test.go:471:
00:22:57     c.Assert(v, checker, args...)
00:22:57 ... obtained map[string]int = map[string]int{"busybox:latest":1}
00:22:57 ... expected map[string]int = map[string]int{"busybox":1}

[andrewhsu]

To run the tests from your branch, you'll need to build the docker-dev image from the components/engine and the cli from components/cli and pass the cli location into the test-integration-cli target with DOCKER_CLI_PATH. You can also restrict the tests run with TESTFLAGS, something like this:

$ docker run --rm -it \
  -e DOCKER_CLI_PATH=/home/ubuntu/src/docker-ce/components/cli/build/docker \
  -e TESTFLAGS='-check.f DockerSwarmSuite.TestServiceLogs'  \
  $docker-dev-image ./hack/make.sh binary test-integration-cli

[nishanttotla]

@andrewhsu ah I see why they're failing. The cherry-pick makes sure that all service images have a default latest tag if one is not provided. The tests need to be fixed.

Can that be done in this PR?

[nishanttotla]

@andrewhsu I've added a fix for those two tests as an extra commit. PTAL.

[nishanttotla]

@andrewhsu now that RC2 is out, could we move ahead with this PR?

[andrewhsu]

LGTM