Browse Source

Merge pull request #40366 from arkodg/check-cidr-ipv6

Handle the error case when fixed-cidr-ipv6 is empty and ipv6 is enabled
Sebastiaan van Stijn 5 years ago
parent
commit
be095a1859
1 changed files with 3 additions and 1 deletions
  1. 3 1
      daemon/daemon_unix.go

+ 3 - 1
daemon/daemon_unix.go

@@ -1023,7 +1023,9 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *config.Co
 		ipamV6Conf     *libnetwork.IpamConf
 	)
 
-	if config.BridgeConfig.FixedCIDRv6 != "" {
+	if config.BridgeConfig.EnableIPv6 && config.BridgeConfig.FixedCIDRv6 == "" {
+		return errdefs.InvalidParameter(errors.New("IPv6 is enabled for the default bridge, but no subnet is configured. Specify an IPv6 subnet using --fixed-cidr-v6"))
+	} else if config.BridgeConfig.FixedCIDRv6 != "" {
 		_, fCIDRv6, err := net.ParseCIDR(config.BridgeConfig.FixedCIDRv6)
 		if err != nil {
 			return err