Fix typos in builder and client

[liubin]

Signed-off-by: bin liu liubin0329@gmail.com

- What I did

Fix typos

[vdemeester]

LGTM 🐯

[vdemeester]

oh well, it's only comments and the test failures were flaky tests, merging 😛

[thaJeztah]

Wow this one looks to have hit the Jackpot for flaky tests

https://jenkins.dockerproject.org/job/Docker-PRs/48284/console

07:31:54 ----------------------------------------------------------------------
07:31:54 FAIL: docker_api_swarm_service_test.go:32: DockerSwarmSuite.TestAPIServiceUpdatePort
07:31:54 
07:31:54 [d0bc96de85375] waiting for daemon to start
07:31:54 [d0bc96de85375] daemon started
07:31:54 
07:31:54 docker_api_swarm_service_test.go:38:
07:31:54     waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
07:31:54 docker_utils_test.go:465:
07:31:54     c.Assert(v, checker, args...)
07:31:54 ... obtained int = 0
07:31:54 ... expected int = 1
07:31:54 
07:31:54 [d0bc96de85375] exiting daemon

and

07:57:05 ----------------------------------------------------------------------
07:57:05 FAIL: docker_cli_swarm_test.go:1682: DockerSwarmSuite.TestSwarmPublishDuplicatePorts
07:57:05 
07:57:05 [d6b47c02567aa] waiting for daemon to start
07:57:05 [d6b47c02567aa] daemon started
07:57:05 
07:57:05 docker_cli_swarm_test.go:1690:
07:57:05     // make sure task has been deployed.
07:57:05     waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
07:57:05 docker_utils_test.go:465:
07:57:05     c.Assert(v, checker, args...)
07:57:05 ... obtained int = 0
07:57:05 ... expected int = 1
07:57:05 
07:57:05 [d6b47c02567aa] exiting daemon
07:57:08 

https://jenkins.dockerproject.org/job/Docker-PRs-powerpc/8703/console (node looks out of disk)

07:45:05 ----------------------------------------------------------------------
07:45:05 FAIL: docker_cli_run_unix_test.go:209: DockerSuite.TestRunAttachDetachFromInvalidFlag
07:45:05 
07:45:05 docker_cli_run_unix_test.go:234:
07:45:05     c.Fatal(err)
07:45:05 ... Error: read |0: file already closed
07:45:05 
07:45:07 

08:42:21 
08:42:21 ----------------------------------------------------------------------
08:42:21 FAIL: docker_cli_swarm_test.go:1147: DockerSwarmSuite.TestSwarmLockUnlockCluster
08:42:21 
08:42:21 [dc59587ca8550] waiting for daemon to start
08:42:21 [dc59587ca8550] daemon started
08:42:21 
08:42:21 [dea014468adc7] waiting for daemon to start
08:42:21 [dea014468adc7] daemon started
08:42:21 
08:42:21 [dd96d99cf997c] waiting for daemon to start
08:42:21 [dd96d99cf997c] daemon started
08:42:21 
08:42:21 [dea014468adc7] exiting daemon
08:42:21 [dea014468adc7] waiting for daemon to start
08:42:21 [dea014468adc7] daemon started
08:42:21 
08:42:21 [dea014468adc7] exiting daemon
08:42:21 docker_cli_swarm_test.go:1161:
08:42:21     c.Assert(err, checker.IsNil, check.Commentf("out: %v", outs))
08:42:21 ... value *exec.ExitError = &exec.ExitError{ProcessState:(*os.ProcessState)(0xc420833cc0), Stderr:[]uint8(nil)} ("exit status 1")
08:42:21 ... out: Error response from daemon: rpc error: code = Unknown desc = raft: failed to process the request: node lost leader status
08:42:21 
08:42:21 
08:42:21 [dc59587ca8550] exiting daemon
08:42:21 [dd96d99cf997c] exiting daemon
08:42:39 

08:59:26 ----------------------------------------------------------------------
08:59:26 FAIL: docker_cli_swarm_test.go:1596: DockerTrustedSwarmSuite.TestTrustedServiceUpdate
08:59:26 
08:59:26 [dd516a9bc0e54] waiting for daemon to start
08:59:26 [dd516a9bc0e54] daemon started
08:59:26 
08:59:26 docker_cli_swarm_test.go:1625:
08:59:26     // tag the image and upload it to the private registry
08:59:26     cli.DockerCmd(c, "tag", "busybox", repoName)
08:59:26 /go/src/github.com/docker/docker/vendor/github.com/gotestyourself/gotestyourself/icmd/command.go:65:
08:59:26     t.Fatalf(err.Error() + "\n")
08:59:26 ... Error: 
08:59:26 Command:  /usr/local/bin/docker tag busybox 127.0.0.1:5000/untrustedservicecreate/createtest:latest
08:59:26 ExitCode: 1
08:59:26 Error:    exit status 1
08:59:26 Stdout:   
08:59:26 Stderr:   Error response from daemon: write /var/lib/docker/image/vfs/.tmp-repositories.json941965206: no space left on device
08:59:26 
08:59:26 
08:59:26 Failures:
08:59:26 ExitCode was 1 expected 0
08:59:26 Expected no error
08:59:26 
08:59:26 
08:59:26 [dd516a9bc0e54] exiting daemon
08:59:30 time="2018-02-27T08:59:30Z" level=info msg="Attempting next endpoint for push after error: Get https://127.0.0.1:5000/v2/: http: server gave HTTP response to HTTPS client"

https://jenkins.dockerproject.org/job/Docker-PRs-WoW-RS1/19801/console

07:19:25 ----------------------------------------------------------------------
07:19:25 FAIL: docker_cli_build_test.go:5515: DockerSuite.TestBuildShellInherited
07:19:25 
07:19:25 docker_cli_build_test.go:5521:
07:19:25     buildImage(name2, build.WithDockerfile(`FROM `+name1+`
07:19:25             RUN -l`)).Assert(c, icmd.Expected{
07:19:25         // ls -l has "total " followed by some number in it, ls without -l does not.
07:19:25         Out: "total ",
07:19:25     })
07:19:25 c:/gopath/src/github.com/docker/docker/vendor/github.com/gotestyourself/gotestyourself/icmd/command.go:65:
07:19:25     t.Fatalf(err.Error() + "\n")
07:19:25 ... Error: 
07:19:25 Command:  d:\CI\CI-88e2651ae\binary\docker.exe build -t testbuildshellinherited2 -
07:19:25 ExitCode: 0
07:19:25 Error:    <nil>
07:19:25 Stdout:   Sending build context to Docker daemon  2.048kB

07:19:25 Step 1/2 : FROM testbuildshellinherited1
07:19:25  ---> a0a28d48d5ef
07:19:25 Step 2/2 : RUN -l
07:19:25  ---> Running in 435c9ff421a8
07:19:25 Removing intermediate container 435c9ff421a8
07:19:25  ---> 8a6963c278b5
07:19:25 Successfully built 8a6963c278b5
07:19:25 Successfully tagged testbuildshellinherited2:latest
07:19:25 
07:19:25 Stderr:   
07:19:25 
07:19:25 Failures:
07:19:25 Expected stdout to contain "total "
07:19:25