Fix wrong network aliases at container creation

The aliases are not correctly set when starting the container.

Signed-off-by: Vincent Demeester <[email protected]>

docker/service/service.go

@@ -398,10 +398,13 @@ func (s *Service) NetworkConnect(ctx context.Context, c *container.Container, ne
 	if err != nil {
 		return err
 	}
-	links := []string{}
+	var links []string
 	// TODO(vdemeester) handle link to self (?)
-	for k, v := range internalLinks {
-		links = append(links, strings.Join([]string{v, k}, ":"))
+	if len(internalLinks) > 0 {
+		links = []string{}
+		for k, v := range internalLinks {
+			links = append(links, strings.Join([]string{v, k}, ":"))
+		}
 	}
 	for _, v := range s.serviceConfig.ExternalLinks {
 		links = append(links, v)

docker/service/service_create.go

@@ -10,6 +10,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api/types"
 	containertypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/network"
 	"github.com/docker/libcompose/config"
 	composecontainer "github.com/docker/libcompose/docker/container"
 	"github.com/docker/libcompose/labels"
@@ -55,9 +56,25 @@ func (s *Service) createContainer(ctx context.Context, namer Namer, oldContainer
 		configWrapper.HostConfig.Binds = util.Merge(configWrapper.HostConfig.Binds, volumeBinds(configWrapper.Config.Volumes, &info))
 	}
 
+	networkConfig := configWrapper.NetworkingConfig
+	if networkConfig == nil {
+		networkConfig = &network.NetworkingConfig{
+			EndpointsConfig: map[string]*network.EndpointSettings{
+				string(configWrapper.HostConfig.NetworkMode): {},
+			},
+		}
+	}
+	for key, value := range networkConfig.EndpointsConfig {
+		conf := value
+		if value.Aliases == nil {
+			value.Aliases = []string{}
+		}
+		value.Aliases = append(value.Aliases, s.name)
+		networkConfig.EndpointsConfig[key] = conf
+	}
 	logrus.Debugf("Creating container %s %#v", containerName, configWrapper)
 	// FIXME(vdemeester): long-term will be container.Create(…)
-	container, err := composecontainer.Create(ctx, client, containerName, configWrapper.Config, configWrapper.HostConfig, configWrapper.NetworkingConfig)
+	container, err := composecontainer.Create(ctx, client, containerName, configWrapper.Config, configWrapper.HostConfig, networkConfig)
 	if err != nil {
 		return nil, err
 	}