Change networks opts into a slice when creating a container

viswesn · Aug 25, 2017 · e9f5de5 · e9f5de5
1 parent a8567d8
commit e9f5de5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/docker/docker.go b/docker/docker.go
@@ -219,7 +219,7 @@ type CreateContainerOpts struct {
 	Privileged      bool
 	HostFQDN        string
 	Labels          map[string]string
-	Networks        map[string]string
+	Networks        []string
 }
 
 func (d *docker) CreateContainer(opts CreateContainerOpts) error {
@@ -286,17 +286,10 @@ func (d *docker) CreateContainer(opts CreateContainerOpts) error {
 		Labels:       opts.Labels,
 	}
 
-	networkConf := &network.NetworkingConfig{}
-	ec := map[string]*network.EndpointSettings{}
-	for netId, hostname := range opts.Networks {
-		es := &network.EndpointSettings{}
-		if hostname != "" {
-			es.Aliases = []string{hostname}
-		}
-		ec[netId] = es
+	networkConf := &network.NetworkingConfig{
+		EndpointsConfig: map[string]*network.EndpointSettings{opts.Networks[0]: &network.EndpointSettings{}},
 	}
 
-	networkConf.EndpointsConfig = ec
 	container, err := d.c.ContainerCreate(context.Background(), cf, h, networkConf, opts.ContainerName)
 
 	if err != nil {
@@ -314,6 +307,16 @@ func (d *docker) CreateContainer(opts CreateContainerOpts) error {
 		}
 	}
 
+	//connect remaining networks if there are any
+	if len(opts.Networks) > 1 {
+		for _, nid := range opts.Networks {
+			err := d.c.NetworkConnect(context.Background(), nid, container.ID, &network.EndpointSettings{})
+			if err != nil {
+				return "", err
+			}
+		}
+	}
+
 	if err := d.copyIfSet(opts.ServerCert, "cert.pem", containerCertDir, opts.ContainerName); err != nil {
 		return err
 	}

diff --git a/provisioner/dind.go b/provisioner/dind.go
@@ -64,7 +64,7 @@ func (d *DinD) InstanceNew(session *types.Session, conf types.InstanceConfig) (*
 		CACert:        conf.CACert,
 		HostFQDN:      conf.Host,
 		Privileged:    true,
-		Networks:      map[string]string{session.Id: conf.Hostname},
+		Networks:      []string{session.Id},
 	}
 
 	dockerClient, err := d.factory.GetForSession(session.Id)

diff --git a/provisioner/windows.go b/provisioner/windows.go
@@ -82,7 +82,7 @@ func (d *windows) InstanceNew(session *types.Session, conf types.InstanceConfig)
 		CACert:          conf.CACert,
 		Privileged:      false,
 		HostFQDN:        conf.Host,
-		Networks:        map[string]string{session.Id: conf.Hostname},
+		Networks:        []string{session.Id},
 	}
 
 	dockerClient, err := d.factory.GetForSession(session.Id)