Skip to content

Commit 61fed5c

Browse files
dgageotdgageot
committed
Merge pull request docker-archive-public#2728 from dgageot/update-docker-client
FIX docker-archive-public#2703 Update dockerclient dependency
2 parents b282f5a + d8fb917 commit 61fed5c

File tree

21 files changed

+1066
-51
lines changed

21 files changed

+1066
-51
lines changed

‎Godeps/Godeps.json‎

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎libmachine/mcndockerclient/docker_client.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,34 @@ import (
77
"github.com/samalba/dockerclient"
88
)
99

10-
func DockerClient(host DockerHost) (*dockerclient.DockerClient, error) {
11-
url, err := host.URL()
10+
// DockerClient creates a docker client for a given host.
11+
func DockerClient(dockerHost DockerHost) (*dockerclient.DockerClient, error) {
12+
url, err := dockerHost.URL()
1213
if err != nil {
1314
return nil, err
1415
}
1516

16-
tlsConfig, err := cert.ReadTLSConfig(url, host.AuthOptions())
17+
tlsConfig, err := cert.ReadTLSConfig(url, dockerHost.AuthOptions())
1718
if err != nil {
1819
return nil, fmt.Errorf("Unable to read TLS config: %s", err)
1920
}
2021

2122
return dockerclient.NewDockerClient(url, tlsConfig)
2223
}
2324

24-
//CreateContainer creates a docker container.
25-
func CreateContainer(dockerHost RemoteDocker, config *dockerclient.ContainerConfig, name string) error {
25+
// CreateContainer creates a docker container.
26+
func CreateContainer(dockerHost DockerHost, config *dockerclient.ContainerConfig, name string) error {
2627
docker, err := DockerClient(dockerHost)
2728
if err != nil {
2829
return err
2930
}
3031

3132
if err = docker.PullImage(config.Image, nil); err != nil {
32-
return fmt.Errorf("Unable to Pull Image: %s", err)
33+
return fmt.Errorf("Unable to pull image: %s", err)
3334
}
3435

35-
containerID, err := docker.CreateContainer(config, name)
36+
var authConfig *dockerclient.AuthConfig
37+
containerID, err := docker.CreateContainer(config, name, authConfig)
3638
if err != nil {
3739
return fmt.Errorf("Error while creating container: %s", err)
3840
}

‎libmachine/mcndockerclient/docker_host.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type RemoteDocker struct {
2727
}
2828

2929
// URL returns the Docker host URL
30-
func (rd RemoteDocker) URL() (string, error) {
30+
func (rd *RemoteDocker) URL() (string, error) {
3131
if rd.HostURL == "" {
3232
return "", fmt.Errorf("Docker Host URL not set")
3333
}
@@ -36,6 +36,6 @@ func (rd RemoteDocker) URL() (string, error) {
3636
}
3737

3838
// AuthOptions returns the authOptions
39-
func (rd RemoteDocker) AuthOptions() *auth.Options {
39+
func (rd *RemoteDocker) AuthOptions() *auth.Options {
4040
return rd.AuthOption
4141
}

‎libmachine/provision/configure_swarm.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
3434

3535
dockerPort := "2376"
3636
dockerDir := p.GetDockerOptionsDir()
37-
dockerHost := fmt.Sprintf("tcp://%s:%s", ip, dockerPort)
38-
dockerClient := mcndockerclient.RemoteDocker{
39-
HostURL: dockerHost,
37+
dockerHost := &mcndockerclient.RemoteDocker{
38+
HostURL: fmt.Sprintf("tcp://%s:%s", ip, dockerPort),
4039
AuthOption: &authOptions,
4140
}
4241
advertiseInfo := fmt.Sprintf("%s:%s", ip, dockerPort)
@@ -81,7 +80,7 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
8180
HostConfig: masterHostConfig,
8281
}
8382

84-
err = mcndockerclient.CreateContainer(dockerClient, swarmMasterConfig, "swarm-agent-master")
83+
err = mcndockerclient.CreateContainer(dockerHost, swarmMasterConfig, "swarm-agent-master")
8584
if err != nil {
8685
return err
8786
}
@@ -107,5 +106,5 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
107106
HostConfig: workerHostConfig,
108107
}
109108

110-
return mcndockerclient.CreateContainer(dockerClient, swarmWorkerConfig, "swarm-agent")
109+
return mcndockerclient.CreateContainer(dockerHost, swarmWorkerConfig, "swarm-agent")
111110
}

‎vendor/github.com/docker/go-units/CONTRIBUTING.md‎

Lines changed: 67 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/go-units/LICENSE.code‎

Lines changed: 191 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)