toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable built-in SD on docker0 network

Browse Source 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: be1c77595eed1d9b22511faf64783e4c65f40c61
Component: engine
This commit is contained in:
Alessandro Boch
2015-10-23 19:46:28 -07:00
parent f937755755
commit 213dc33b1a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_network_unix_test.go
+3 -3
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()