diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index c0dd588e76..561837e2f5 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -1043,18 +1043,6 @@ func getDefaultBridgeName(cfg config.BridgeConfig) (bridgeName string, userManag // create it, and it is not possible to supply an address using --bip. return cfg.Iface, true } - // Without a --bridge, the bridge is "docker0", created and managed by the - // daemon. A --bip (cidr) can be supplied to define the bridge's IP address - // and the network's subnet. - // - // Env var DOCKER_TEST_CREATE_DEFAULT_BRIDGE env var modifies the default - // bridge name. Unlike '--bridge', the bridge does not need to be created - // outside the daemon, and it's still possible to use '--bip'. It is - // intended only for use in moby tests; it may be removed, its behaviour - // may be modified, and it may not do what you want anyway! - if bn := os.Getenv("DOCKER_TEST_CREATE_DEFAULT_BRIDGE"); bn != "" { - return bn, false - } return bridge.DefaultBridgeName, false } diff --git a/libnetwork/drivers/bridge/setup_device_linux.go b/libnetwork/drivers/bridge/setup_device_linux.go index 374c6b7b6f..006a2aa751 100644 --- a/libnetwork/drivers/bridge/setup_device_linux.go +++ b/libnetwork/drivers/bridge/setup_device_linux.go @@ -15,15 +15,7 @@ import ( // SetupDevice create a new bridge interface/ func setupDevice(config *networkConfiguration, i *bridgeInterface) error { - // We only attempt to create the bridge when the requested device name is - // the default one. The default bridge name can be overridden with the - // DOCKER_TEST_CREATE_DEFAULT_BRIDGE env var. It should be used only for - // test purpose. - var defaultBridgeName string - if defaultBridgeName = os.Getenv("DOCKER_TEST_CREATE_DEFAULT_BRIDGE"); defaultBridgeName == "" { - defaultBridgeName = DefaultBridgeName - } - if config.BridgeName != defaultBridgeName && config.DefaultBridge { + if config.BridgeName != DefaultBridgeName && config.DefaultBridge { return NonDefaultBridgeExistError(config.BridgeName) }