Set EnableIPv4 for predefined networks

robmry · robmry · commit 1f542d5d6ce1 · 2024-07-31T18:38:43.000+01:00
Signed-off-by: Rob Murray &lt;rob.murray@docker.com&gt;
diff --git a/daemon/cluster/executor/container/container.go b/daemon/cluster/executor/container/container.go
@@ -626,13 +626,15 @@ func (c *containerConfig) networkCreateRequest(name string) (clustertypes.Networ
 		return clustertypes.NetworkCreateRequest{}, errors.New("container: unknown network referenced")
 	}
 
+	ipv4Enabled := true
 	ipv6Enabled := na.Network.Spec.Ipv6Enabled
 	options := network.CreateOptions{
 		// ID:     na.Network.ID,
 		Labels:     na.Network.Spec.Annotations.Labels,
 		Internal:   na.Network.Spec.Internal,
 		Attachable: na.Network.Spec.Attachable,
 		Ingress:    convert.IsIngressNetwork(na.Network),
+		EnableIPv4: &ipv4Enabled,
 		EnableIPv6: &ipv6Enabled,
 		Scope:      scope.Swarm,
 	}
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
@@ -1051,6 +1051,7 @@ func initBridgeDriver(controller *libnetwork.Controller, cfg config.BridgeConfig
 	}
 	// Initialize default network on "bridge" with the same name
 	_, err = controller.NewNetwork("bridge", network.NetworkBridge, "",
+		libnetwork.NetworkOptionEnableIPv4(true),
 		libnetwork.NetworkOptionEnableIPv6(cfg.EnableIPv6),
 		libnetwork.NetworkOptionDriverOpts(netOption),
 		libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil),
diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go
@@ -386,6 +386,7 @@ func (daemon *Daemon) initNetworkController(daemonCfg *config.Config, activeSand
 		_, err := daemon.netController.NewNetwork(strings.ToLower(v.Type), name, nid,
 			libnetwork.NetworkOptionGeneric(options.Generic{
 				netlabel.GenericData: netOption,
+				netlabel.EnableIPv4:  true,
 			}),
 			libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil),
 		)
@@ -430,6 +431,7 @@ func initBridgeDriver(controller *libnetwork.Controller, config config.BridgeCon
 	_, err := controller.NewNetwork(network.DefaultNetwork, network.DefaultNetwork, "",
 		libnetwork.NetworkOptionGeneric(options.Generic{
 			netlabel.GenericData: netOption,
+			netlabel.EnableIPv4:  true,
 		}),
 		ipamOption,
 	)
diff --git a/libnetwork/default_gateway_linux.go b/libnetwork/default_gateway_linux.go
@@ -20,6 +20,7 @@ func (c *Controller) createGWNetwork() (*Network, error) {
 			bridge.EnableICC:          strconv.FormatBool(false),
 			bridge.EnableIPMasquerade: strconv.FormatBool(true),
 		}),
+		NetworkOptionEnableIPv4(true),
 		NetworkOptionEnableIPv6(false),
 	)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -1051,6 +1051,7 @@ func initBridgeDriver(controller *libnetwork.Controller, cfg config.BridgeConfig`
`1051`	`1051`	`}`
`1052`	`1052`	`// Initialize default network on "bridge" with the same name`
`1053`	`1053`	`_, err = controller.NewNetwork("bridge", network.NetworkBridge, "",`
	`1054`	`+ libnetwork.NetworkOptionEnableIPv4(true),`
`1054`	`1055`	`libnetwork.NetworkOptionEnableIPv6(cfg.EnableIPv6),`
`1055`	`1056`	`libnetwork.NetworkOptionDriverOpts(netOption),`
`1056`	`1057`	`libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil),`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ func (c Controller) createGWNetwork() (Network, error) {`
`20`	`20`	`bridge.EnableICC: strconv.FormatBool(false),`
`21`	`21`	`bridge.EnableIPMasquerade: strconv.FormatBool(true),`
`22`	`22`	`}),`
	`23`	`+ NetworkOptionEnableIPv4(true),`
`23`	`24`	`NetworkOptionEnableIPv6(false),`
`24`	`25`	`)`
`25`	`26`	`if err != nil {`