Merge pull request moby#48821 from robmry/remove_islinkable

Remove function isLinkable

daemon/container_operations_unix.go

@@ -85,7 +85,7 @@ func (daemon *Daemon) addLegacyLinks(
 		return nil
 	}
 	for _, child := range children {
-		if !isLinkable(child) {
+		if _, ok := child.NetworkSettings.Networks[network.DefaultNetwork]; !ok {
 			return fmt.Errorf("Cannot link to %s, as it does not belong to the default network", child.Name)
 		}
 	}
@@ -487,12 +487,6 @@ func killProcessDirectly(ctr *container.Container) error {
 	return nil
 }
 
-func isLinkable(child *container.Container) bool {
-	// A container is linkable only if it belongs to the default network
-	_, ok := child.NetworkSettings.Networks[network.DefaultNetwork]
-	return ok
-}
-
 // TODO(aker): remove when we make the default bridge network behave like any other network
 func enableIPOnPredefinedNetwork() bool {
 	return false

daemon/container_operations_windows.go

@@ -161,10 +161,6 @@ func killProcessDirectly(ctr *container.Container) error {
 	return nil
 }
 
-func isLinkable(child *container.Container) bool {
-	return false
-}
-
 func enableIPOnPredefinedNetwork() bool {
 	return true
 }