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

Merge pull request #17325 from aboch/d0

Browse source 
Disable built-in SD on default bridge network
This commit is contained in:
Tibor Vass 2015-10-25 11:04:27 -04:00
commit 271f85afac
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/container_unix.go
View file

@ -860,7 +860,7 @@ func (container *Container) buildCreateEndpointOptions(n libnetwork.Network) ([]
createOptions = append(createOptions, libnetwork.EndpointOptionGeneric(genericOption))
}
if n.Name() == "bridge" && !container.daemon.config().Bridge.InterContainerCommunication {
if n.Name() == "bridge" {
createOptions = append(createOptions, libnetwork.CreateOptionAnonymous())
}

6
integration-cli/docker_cli_network_unix_test.go
View file

@ -409,8 +409,8 @@ func (s *DockerNetworkSuite) TestDockerNetworkDriverOptions(c *check.C) {
}
func (s *DockerDaemonSuite) TestDockerNetworkDiscoveryICCFalse(c *check.C) {
// When icc == false, containers' etc/hosts should not be populated with containers' names
func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *check.C) {
// On default bridge network built-in service discovery should not happen
hostsFile := "/etc/hosts"
bridgeName := "external-bridge"
bridgeIP := "192.169.255.254/24"
@ -418,7 +418,7 @@ func (s *DockerDaemonSuite) TestDockerNetworkDiscoveryICCFalse(c *check.C) {
c.Assert(err, check.IsNil, check.Commentf(out))
defer deleteInterface(c, bridgeName)
err = s.d.StartWithBusybox("--bridge", bridgeName, "--icc=false")
err = s.d.StartWithBusybox("--bridge", bridgeName)
c.Assert(err, check.IsNil)
defer s.d.Restart()