beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #17558 from aboch/nw

Browse source 
Fix bug in initializeNetwork()
This commit is contained in:
David Calavera 2015-11-02 12:15:41 -08:00
commit beeec6d103
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
daemon/container_unix.go
View file

@ -913,6 +913,13 @@ func (container *Container) allocateNetwork() error {
if mode.IsDefault() { if mode.IsDefault() {
networkName = controller.Config().Daemon.DefaultNetwork networkName = controller.Config().Daemon.DefaultNetwork
} }
if mode.IsUserDefined() {
n, err := container.daemon.FindNetwork(networkName)
if err != nil {
return err
}
networkName = n.Name()
}
container.NetworkSettings.Networks = make(map[string]*network.EndpointSettings) container.NetworkSettings.Networks = make(map[string]*network.EndpointSettings)
container.NetworkSettings.Networks[networkName] = new(network.EndpointSettings) container.NetworkSettings.Networks[networkName] = new(network.EndpointSettings)
updateSettings = true updateSettings = true
@ -953,9 +960,7 @@ func (container *Container) ConnectToNetwork(idOrName string) error {
return nil return nil
} }
func (container *Container) connectToNetwork(idOrName string, updateSettings bool) error { func (container *Container) connectToNetwork(idOrName string, updateSettings bool) (err error) {
var err error
if container.hostConfig.NetworkMode.IsContainer() { if container.hostConfig.NetworkMode.IsContainer() {
return runconfig.ErrConflictSharedNetwork return runconfig.ErrConflictSharedNetwork
} }

5
integration-cli/docker_cli_network_unix_test.go
View file

@ -733,3 +733,8 @@ func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksUngracefulDaemonRe
verifyContainerIsConnectedToNetworks(c, s.d, cName, nwList) verifyContainerIsConnectedToNetworks(c, s.d, cName, nwList)
} }
func (s *DockerNetworkSuite) TestDockerNetworkRunNetByID(c *check.C) {
out, _ := dockerCmd(c, "network", "create", "one")
dockerCmd(c, "run", "-d", "--net", strings.TrimSpace(out), "busybox", "top")
}