Merge pull request #818 from selansen/master

Allow user to specify default address pools for docker networks
docker · May 8, 2018 · c31b61b · c31b61b
2 parents 0ff5f52 + 75c7b95
commit c31b61b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md
@@ -40,6 +40,7 @@ Options:
   -D, --debug                                 Enable debug mode
       --default-gateway ip                    Container default gateway IPv4 address
       --default-gateway-v6 ip                 Container default gateway IPv6 address
+      --default-address-pool                  Set the default address pool for local node networks
       --default-runtime string                Default OCI runtime for containers (default "runc")
       --default-ulimit ulimit                 Default ulimits for containers (default [])
       --dns list                              DNS server to use (default [])
@@ -1348,7 +1349,9 @@ This is a full example of the allowed configuration options on Linux:
 				"--debug"
 			]
 		}
-	}
+	},
+	"default-address-pools":[{"base":"172.80.0.0/16","size":24},
+	{"base":"172.90.0.0/16","size":24}]
 }
 ```
 

diff --git a/man/dockerd.8.md b/man/dockerd.8.md
@@ -22,6 +22,7 @@ dockerd - Enable daemon mode
 [**-D**|**--debug**]
 [**--default-gateway**[=*DEFAULT-GATEWAY*]]
 [**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
+[**--default-address-pool**[=*DEFAULT-ADDRESS-POOL*]]
 [**--default-runtime**[=*runc*]]
 [**--default-ipc-mode**=*MODE*]
 [**--default-shm-size**[=*64MiB*]]
@@ -183,6 +184,11 @@ $ sudo dockerd --add-runtime runc=runc --add-runtime custom=/usr/local/bin/my-ru
 **--default-gateway-v6**=""
   IPv6 address of the container default gateway
 
+**--default-address-pool**=""
+  Default address pool from which IPAM driver selects a subnet for the networks.
+  Example: base=172.30.0.0/16,size=24 will set the default
+  address pools for the selected scope networks to {172.30.[0-255].0/24}
+
 **--default-runtime**="runc"
   Set default runtime if there're more than one specified by `--add-runtime`.