Allow user to specify default address pools for docker networks

This is separate commit for CLI files to address PR 36054 Signed-off-by: selansen <[email protected]>
docker · Jan 19, 2018 · 87b4738 · 87b4738
1 parent da86425
commit 87b4738
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
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-node-local-address-pools      Set the default address pools 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 [])

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-node-local-address-pools**[=*DEFAULT-NODE-LOCAL-ADDRESS-POOLS*]]
 [**--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-node-local-address-pools**=""
+  Default address pools 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`.