@@ -511,7 +511,7 @@ func (daemon *Daemon) updateNetworkConfig(container *container.Container, idOrNa

 	}

 	if !containertypes.NetworkMode(idOrName).IsUserDefined() {

-		if hasUserDefinedIPAddress(endpointConfig) {

+		if hasUserDefinedIPAddress(endpointConfig) && !enableIPOnPredefinedNetwork() {

 			return nil, runconfig.ErrUnsupportedNetworkAndIP

 		}

 		if endpointConfig != nil && len(endpointConfig.Aliases) > 0 {

@@ -383,3 +383,7 @@ func isLinkable(child *container.Container) bool {

 func errRemovalContainer(containerID string) error {

 	return fmt.Errorf("Container %s is marked for removal and cannot be connected or disconnected to the network", containerID)

 }

+

+func enableIPOnPredefinedNetwork() bool {

+	return false

+}

@@ -55,3 +55,7 @@ func killProcessDirectly(container *container.Container) error {

 func isLinkable(child *container.Container) bool {

 	return false

 }

+

+func enableIPOnPredefinedNetwork() bool {

+	return true

+}