From be1c77595eed1d9b22511faf64783e4c65f40c61 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Fri, 23 Oct 2015 19:37:35 -0700 Subject: [PATCH] Disable built-in SD on docker0 network Signed-off-by: Alessandro Boch --- daemon/container_unix.go | 2 +- integration-cli/docker_cli_network_unix_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/container_unix.go b/daemon/container_unix.go index 6e085929d5..89dbcfad4c 100644 --- a/daemon/container_unix.go +++ b/daemon/container_unix.go @@ -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()) } diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go index 39b34c4387..8bf5659233 100644 --- a/integration-cli/docker_cli_network_unix_test.go +++ b/integration-cli/docker_cli_network_unix_test.go @@ -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()