mirror of https://github.com/docker/cli.git
Add docs for --ipv6 option, also add --internal as appropriate
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
This commit is contained in:
parent
c7b4d1c449
commit
65c94a34be
|
@ -1275,7 +1275,7 @@ _docker_network_connect() {
|
||||||
|
|
||||||
_docker_network_create() {
|
_docker_network_create() {
|
||||||
case "$prev" in
|
case "$prev" in
|
||||||
--aux-address|--gateway|--ip-range|--ipam-opt|--opt|-o|--subnet)
|
--aux-address|--gateway|--internal|--ip-range|--ipam-opt|--ipv6|--opt|-o|--subnet)
|
||||||
return
|
return
|
||||||
;;
|
;;
|
||||||
--ipam-driver)
|
--ipam-driver)
|
||||||
|
@ -1294,7 +1294,7 @@ _docker_network_create() {
|
||||||
|
|
||||||
case "$cur" in
|
case "$cur" in
|
||||||
-*)
|
-*)
|
||||||
COMPREPLY=( $( compgen -W "--aux-address --driver -d --gateway --help --internal --ip-range --ipam-driver --ipam-opt --opt -o --subnet" -- "$cur" ) )
|
COMPREPLY=( $( compgen -W "--aux-address --driver -d --gateway --help --internal --ip-range --ipam-driver --ipam-opt --ipv6 --opt -o --subnet" -- "$cur" ) )
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
|
@ -332,6 +332,7 @@ __docker_network_subcommand() {
|
||||||
"($help)*--ip-range=[Allocate container ip from a sub-range]:IP/mask: " \
|
"($help)*--ip-range=[Allocate container ip from a sub-range]:IP/mask: " \
|
||||||
"($help)--ipam-driver=[IP Address Management Driver]:driver:(default)" \
|
"($help)--ipam-driver=[IP Address Management Driver]:driver:(default)" \
|
||||||
"($help)*--ipam-opt=[Set custom IPAM plugin options]:opt=value: " \
|
"($help)*--ipam-opt=[Set custom IPAM plugin options]:opt=value: " \
|
||||||
|
"($help)--ipv6[Enable IPv6 networking]" \
|
||||||
"($help)*"{-o=,--opt=}"[Set driver specific options]:opt=value: " \
|
"($help)*"{-o=,--opt=}"[Set driver specific options]:opt=value: " \
|
||||||
"($help)*--subnet=[Subnet in CIDR format that represents a network segment]:IP/mask: " \
|
"($help)*--subnet=[Subnet in CIDR format that represents a network segment]:IP/mask: " \
|
||||||
"($help -)1:Network Name: " && ret=0
|
"($help -)1:Network Name: " && ret=0
|
||||||
|
|
|
@ -22,6 +22,7 @@ parent = "smn_cli"
|
||||||
--ip-range=[] Allocate container ip from a sub-range
|
--ip-range=[] Allocate container ip from a sub-range
|
||||||
--ipam-driver=default IP Address Management Driver
|
--ipam-driver=default IP Address Management Driver
|
||||||
--ipam-opt=map[] Set custom IPAM driver specific options
|
--ipam-opt=map[] Set custom IPAM driver specific options
|
||||||
|
--ipv6 Enable IPv6 networking
|
||||||
-o --opt=map[] Set custom driver specific options
|
-o --opt=map[] Set custom driver specific options
|
||||||
--subnet=[] Subnet in CIDR format that represents a network segment
|
--subnet=[] Subnet in CIDR format that represents a network segment
|
||||||
|
|
||||||
|
@ -134,7 +135,13 @@ The following are those options and the equivalent docker daemon flags used for
|
||||||
| `com.docker.network.bridge.enable_icc` | `--icc` | Enable or Disable Inter Container Connectivity |
|
| `com.docker.network.bridge.enable_icc` | `--icc` | Enable or Disable Inter Container Connectivity |
|
||||||
| `com.docker.network.bridge.host_binding_ipv4` | `--ip` | Default IP when binding container ports |
|
| `com.docker.network.bridge.host_binding_ipv4` | `--ip` | Default IP when binding container ports |
|
||||||
| `com.docker.network.mtu` | `--mtu` | Set the containers network MTU |
|
| `com.docker.network.mtu` | `--mtu` | Set the containers network MTU |
|
||||||
| `com.docker.network.enable_ipv6` | `--ipv6` | Enable IPv6 networking |
|
|
||||||
|
The following arguments can be passed to `docker network create` for any network driver.
|
||||||
|
|
||||||
|
| Argument | Equivalent | Description |
|
||||||
|
|--------------|------------|------------------------------------------|
|
||||||
|
| `--internal` | - | Restricts external access to the network |
|
||||||
|
| `--ipv6` | `--ipv6` | Enable IPv6 networking |
|
||||||
|
|
||||||
For example, let's use `-o` or `--opt` options to specify an IP address binding when publishing ports:
|
For example, let's use `-o` or `--opt` options to specify an IP address binding when publishing ports:
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@ docker-network-create - create a new network
|
||||||
[**--ip-range**=*[]*]
|
[**--ip-range**=*[]*]
|
||||||
[**--ipam-driver**=*default*]
|
[**--ipam-driver**=*default*]
|
||||||
[**--ipam-opt**=*map[]*]
|
[**--ipam-opt**=*map[]*]
|
||||||
|
[**--ipv6**]
|
||||||
[**-o**|**--opt**=*map[]*]
|
[**-o**|**--opt**=*map[]*]
|
||||||
[**--subnet**=*[]*]
|
[**--subnet**=*[]*]
|
||||||
NETWORK-NAME
|
NETWORK-NAME
|
||||||
|
@ -152,6 +153,9 @@ If you want to create an externally isolated `overlay` network, you can specify
|
||||||
**--ipam-opt**=map[]
|
**--ipam-opt**=map[]
|
||||||
Set custom IPAM driver options
|
Set custom IPAM driver options
|
||||||
|
|
||||||
|
**--ipv6**
|
||||||
|
Enable IPv6 networking
|
||||||
|
|
||||||
**-o**, **--opt**=map[]
|
**-o**, **--opt**=map[]
|
||||||
Set custom driver options
|
Set custom driver options
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue