docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix vet issues 

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot 2015-12-24 13:30:02 +01:00
parent 6462e7ecfa
commit 946712b1f7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commands/ls.go
View File

@ -305,7 +305,10 @@ func attemptGetHostState(h *host.Host, stateQueryChan chan<- HostListItem) {
if err == nil && url != "" { if err == nil && url != "" {
// PERFORMANCE: Reuse the url instead of asking the host again. // PERFORMANCE: Reuse the url instead of asking the host again.
// This reduces the number of calls to the drivers // This reduces the number of calls to the drivers
dockerHost := &mcndockerclient.RemoteDocker{url, h.AuthOptions()} dockerHost := &mcndockerclient.RemoteDocker{
HostURL: url,
AuthOption: h.AuthOptions(),
}
dockerVersion, err = mcndockerclient.DockerVersion(dockerHost) dockerVersion, err = mcndockerclient.DockerVersion(dockerHost)
if err != nil { if err != nil {

5
libmachine/provision/configure_swarm.go
View File

@ -35,7 +35,10 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
dockerPort := "2376" dockerPort := "2376"
dockerDir := p.GetDockerOptionsDir() dockerDir := p.GetDockerOptionsDir()
dockerHost := fmt.Sprintf("tcp://%s:%s", ip, dockerPort) dockerHost := fmt.Sprintf("tcp://%s:%s", ip, dockerPort)
dockerClient := mcndockerclient.RemoteDocker{dockerHost, &authOptions} dockerClient := mcndockerclient.RemoteDocker{
HostURL: dockerHost,
AuthOption: &authOptions,
}
advertiseInfo := fmt.Sprintf("%s:%s", ip, dockerPort) advertiseInfo := fmt.Sprintf("%s:%s", ip, dockerPort)
if swarmOptions.Master { if swarmOptions.Master {