Skip to content

Commit

Permalink
Allow user to specify default address pools for docker networks
Browse files Browse the repository at this point in the history
This is separate commit for CLI files to address PR 36054

Signed-off-by: selansen <[email protected]>
  • Loading branch information
selansen committed May 4, 2018
1 parent f42c66b commit e949b50
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
3 changes: 3 additions & 0 deletions docs/reference/commandline/dockerd.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [])
Expand Down Expand Up @@ -1349,6 +1350,8 @@ This is a full example of the allowed configuration options on Linux:
]
}
}
"default-address-pools":[{"base":"172.80.0.0/16","size":24},
{"base":"172.90.0.0/16","size":24}]
}
```

Expand Down
6 changes: 6 additions & 0 deletions man/dockerd.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -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*]]
Expand Down Expand Up @@ -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`.

Expand Down

0 comments on commit e949b50

Please sign in to comment.