Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #818 from selansen/master 

Allow user to specify default address pools for docker networks
This commit is contained in:
Sebastiaan van Stijn 2018-05-08 14:17:00 +02:00 committed by GitHub
parent 0ff5f52051 75c7b95e7a
commit c31b61bff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/reference/commandline/dockerd.md
View File

@ -40,6 +40,7 @@ Options:
-D, --debug Enable debug mode -D, --debug Enable debug mode
--default-gateway ip Container default gateway IPv4 address --default-gateway ip Container default gateway IPv4 address
--default-gateway-v6 ip Container default gateway IPv6 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-runtime string Default OCI runtime for containers (default "runc")
--default-ulimit ulimit Default ulimits for containers (default []) --default-ulimit ulimit Default ulimits for containers (default [])
--dns list DNS server to use (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" "--debug"
] ]
} }
} },
"default-address-pools":[{"base":"172.80.0.0/16","size":24},
{"base":"172.90.0.0/16","size":24}]
} }
``` ```

6
man/dockerd.8.md
View File

@ -22,6 +22,7 @@ dockerd - Enable daemon mode
[**-D**|**--debug**] [**-D**|**--debug**]
[**--default-gateway**[=*DEFAULT-GATEWAY*]] [**--default-gateway**[=*DEFAULT-GATEWAY*]]
[**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]] [**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
[**--default-address-pool**[=*DEFAULT-ADDRESS-POOL*]]
[**--default-runtime**[=*runc*]] [**--default-runtime**[=*runc*]]
[**--default-ipc-mode**=*MODE*] [**--default-ipc-mode**=*MODE*]
[**--default-shm-size**[=*64MiB*]] [**--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**="" **--default-gateway-v6**=""
IPv6 address of the container default gateway 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" **--default-runtime**="runc"
Set default runtime if there're more than one specified by `--add-runtime`. Set default runtime if there're more than one specified by `--add-runtime`.