homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update github.com/docker/libcompose

Browse source 
Update github.com/docker/libcompose in glide.* files.
Vendor github.com/docker/libcompose update.
This commit is contained in:
Timo Reimann 2017-07-10 17:17:31 +02:00 • committed by Ludovic Fernandez
parent 7ff6c32452
commit 19a5ba3264
3 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
vendor/github.com/docker/libcompose/docker/service/service_create.go generated vendored
View file

@ -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,28 @@ 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 configWrapper.HostConfig.NetworkMode != "" && configWrapper.HostConfig.NetworkMode.IsUserDefined() {
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
}