kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #29741 from yuexiao-wang/update-option

Browse source 
keep network options consistent between network connect and run
This commit is contained in:
Vincent Demeester 2017-01-06 19:01:48 +01:00 committed by GitHub
commit ee9bb347a6
8 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/command/container/opts.go
View file

@ -193,11 +193,11 @@ func addFlags(flags *pflag.FlagSet) *containerOptions {
flags.MarkHidden("dns-opt") flags.MarkHidden("dns-opt")
flags.Var(&copts.dnsSearch, "dns-search", "Set custom DNS search domains") flags.Var(&copts.dnsSearch, "dns-search", "Set custom DNS search domains")
flags.Var(&copts.expose, "expose", "Expose a port or a range of ports") flags.Var(&copts.expose, "expose", "Expose a port or a range of ports")
flags.StringVar(&copts.ipv4Address, "ip", "", "Container IPv4 address (e.g. 172.30.100.104)") flags.StringVar(&copts.ipv4Address, "ip", "", "IPv4 address (e.g., 172.30.100.104)")
flags.StringVar(&copts.ipv6Address, "ip6", "", "Container IPv6 address (e.g. 2001:db8::33)") flags.StringVar(&copts.ipv6Address, "ip6", "", "IPv6 address (e.g., 2001:db8::33)")
flags.Var(&copts.links, "link", "Add link to another container") flags.Var(&copts.links, "link", "Add link to another container")
flags.Var(&copts.linkLocalIPs, "link-local-ip", "Container IPv4/IPv6 link-local addresses") flags.Var(&copts.linkLocalIPs, "link-local-ip", "Container IPv4/IPv6 link-local addresses")
flags.StringVar(&copts.macAddress, "mac-address", "", "Container MAC address (e.g. 92:d0:c6:0a:29:33)") flags.StringVar(&copts.macAddress, "mac-address", "", "Container MAC address (e.g., 92:d0:c6:0a:29:33)")
flags.VarP(&copts.publish, "publish", "p", "Publish a container's port(s) to the host") flags.VarP(&copts.publish, "publish", "p", "Publish a container's port(s) to the host")
flags.BoolVarP(&copts.publishAll, "publish-all", "P", false, "Publish all exposed ports to random ports") flags.BoolVarP(&copts.publishAll, "publish-all", "P", false, "Publish all exposed ports to random ports")
// We allow for both "--net" and "--network", although the latter is the recommended way. // We allow for both "--net" and "--network", although the latter is the recommended way.

4
cli/command/network/connect.go
View file

@ -37,8 +37,8 @@ func newConnectCommand(dockerCli *command.DockerCli) *cobra.Command {
} }
flags := cmd.Flags() flags := cmd.Flags()
flags.StringVar(&opts.ipaddress, "ip", "", "IP Address") flags.StringVar(&opts.ipaddress, "ip", "", "IPv4 address (e.g., 172.30.100.104)")
flags.StringVar(&opts.ipv6address, "ip6", "", "IPv6 Address") flags.StringVar(&opts.ipv6address, "ip6", "", "IPv6 address (e.g., 2001:db8::33)")
flags.Var(&opts.links, "link", "Add link to another container") flags.Var(&opts.links, "link", "Add link to another container")
flags.StringSliceVar(&opts.aliases, "alias", []string{}, "Add network-scoped alias for the container") flags.StringSliceVar(&opts.aliases, "alias", []string{}, "Add network-scoped alias for the container")
flags.StringSliceVar(&opts.linklocalips, "link-local-ip", []string{}, "Add a link-local address for the container") flags.StringSliceVar(&opts.linklocalips, "link-local-ip", []string{}, "Add a link-local address for the container")

4
contrib/completion/fish/docker.fish
View file

@ -135,7 +135,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s i -l interac
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l ipc -d 'Default is to create a private IPC namespace (POSIX SysV IPC) for the container' complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l ipc -d 'Default is to create a private IPC namespace (POSIX SysV IPC) for the container'
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l link -d 'Add link to another container in the form of <name|id>:alias' complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l link -d 'Add link to another container in the form of <name|id>:alias'
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s m -l memory -d 'Memory limit (format: <number>[<unit>], where unit = b, k, m or g)' complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s m -l memory -d 'Memory limit (format: <number>[<unit>], where unit = b, k, m or g)'
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l mac-address -d 'Container MAC address (e.g. 92:d0:c6:0a:29:33)' complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l mac-address -d 'Container MAC address (e.g., 92:d0:c6:0a:29:33)'
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l memory-swap -d "Total memory usage (memory + swap), set '-1' to disable swap (format: <number>[<unit>], where unit = b, k, m or g)" complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l memory-swap -d "Total memory usage (memory + swap), set '-1' to disable swap (format: <number>[<unit>], where unit = b, k, m or g)"
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l name -d 'Assign a name to the container' complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l name -d 'Assign a name to the container'
complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l net -d 'Set the Network mode for the container' complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l net -d 'Set the Network mode for the container'
@ -326,7 +326,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s i -l interactiv
complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l ipc -d 'Default is to create a private IPC namespace (POSIX SysV IPC) for the container' complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l ipc -d 'Default is to create a private IPC namespace (POSIX SysV IPC) for the container'
complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l link -d 'Add link to another container in the form of <name|id>:alias' complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l link -d 'Add link to another container in the form of <name|id>:alias'
complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s m -l memory -d 'Memory limit (format: <number>[<unit>], where unit = b, k, m or g)' complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s m -l memory -d 'Memory limit (format: <number>[<unit>], where unit = b, k, m or g)'
complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l mac-address -d 'Container MAC address (e.g. 92:d0:c6:0a:29:33)' complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l mac-address -d 'Container MAC address (e.g., 92:d0:c6:0a:29:33)'
complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l memory-swap -d "Total memory usage (memory + swap), set '-1' to disable swap (format: <number>[<unit>], where unit = b, k, m or g)" complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l memory-swap -d "Total memory usage (memory + swap), set '-1' to disable swap (format: <number>[<unit>], where unit = b, k, m or g)"
complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l name -d 'Assign a name to the container' complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l name -d 'Assign a name to the container'
complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l net -d 'Set the Network mode for the container' complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l net -d 'Set the Network mode for the container'

10
contrib/completion/zsh/_docker
View file

@ -541,12 +541,12 @@ __docker_container_subcommand() {
"($help)*--group=[Set one or more supplementary user groups for the container]:group:_groups" "($help)*--group=[Set one or more supplementary user groups for the container]:group:_groups"
"($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts" "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts"
"($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]"
"($help)--ip=[Container IPv4 address]:IPv4: " "($help)--ip=[IPv4 address]:IPv4: "
"($help)--ip6=[Container IPv6 address]:IPv6: " "($help)--ip6=[IPv6 address]:IPv6: "
"($help)--ipc=[IPC namespace to use]:IPC namespace: " "($help)--ipc=[IPC namespace to use]:IPC namespace: "
"($help)--isolation=[Container isolation technology]:isolation:(default hyperv process)" "($help)--isolation=[Container isolation technology]:isolation:(default hyperv process)"
"($help)*--link=[Add link to another container]:link:->link" "($help)*--link=[Add link to another container]:link:->link"
"($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: " "($help)*--link-local-ip=[Container IPv4/IPv6 link-local addresses]:IPv4/IPv6: "
"($help)*"{-l=,--label=}"[Container metadata]:label: " "($help)*"{-l=,--label=}"[Container metadata]:label: "
"($help)--log-driver=[Default driver for container logs]:logging driver:__docker_complete_log_drivers" "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_complete_log_drivers"
"($help)*--log-opt=[Log driver specific options]:log driver options:__docker_complete_log_options" "($help)*--log-opt=[Log driver specific options]:log driver options:__docker_complete_log_options"
@ -1142,8 +1142,8 @@ __docker_network_subcommand() {
_arguments $(__docker_arguments) \ _arguments $(__docker_arguments) \
$opts_help \ $opts_help \
"($help)*--alias=[Add network-scoped alias for the container]:alias: " \ "($help)*--alias=[Add network-scoped alias for the container]:alias: " \
"($help)--ip=[Container IPv4 address]:IPv4: " \ "($help)--ip=[IPv4 address]:IPv4: " \
"($help)--ip6=[Container IPv6 address]:IPv6: " \ "($help)--ip6=[IPv6 address]:IPv6: " \
"($help)*--link=[Add a link to another container]:link:->link" \ "($help)*--link=[Add a link to another container]:link:->link" \
"($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: " \ "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: " \
"($help -)1:network:__docker_complete_networks" \ "($help -)1:network:__docker_complete_networks" \

6
docs/reference/commandline/create.md
View file

@ -66,8 +66,8 @@ Options:
-i, --interactive Keep STDIN open even if not attached -i, --interactive Keep STDIN open even if not attached
--io-maxbandwidth string Maximum IO bandwidth limit for the system drive (Windows only) --io-maxbandwidth string Maximum IO bandwidth limit for the system drive (Windows only)
--io-maxiops uint Maximum IOps limit for the system drive (Windows only) --io-maxiops uint Maximum IOps limit for the system drive (Windows only)
--ip string Container IPv4 address (e.g. 172.30.100.104) --ip string IPv4 address (e.g., 172.30.100.104)
--ip6 string Container IPv6 address (e.g. 2001:db8::33) --ip6 string IPv6 address (e.g., 2001:db8::33)
--ipc string IPC namespace to use --ipc string IPC namespace to use
--isolation string Container isolation technology --isolation string Container isolation technology
--kernel-memory string Kernel memory limit --kernel-memory string Kernel memory limit
@ -77,7 +77,7 @@ Options:
--link-local-ip value Container IPv4/IPv6 link-local addresses (default []) --link-local-ip value Container IPv4/IPv6 link-local addresses (default [])
--log-driver string Logging driver for the container --log-driver string Logging driver for the container
--log-opt value Log driver options (default []) --log-opt value Log driver options (default [])
--mac-address string Container MAC address (e.g. 92:d0:c6:0a:29:33) --mac-address string Container MAC address (e.g., 92:d0:c6:0a:29:33)
-m, --memory string Memory limit -m, --memory string Memory limit
--memory-reservation string Memory soft limit --memory-reservation string Memory soft limit
--memory-swap string Swap limit equal to memory plus swap: '-1' to enable unlimited swap --memory-swap string Swap limit equal to memory plus swap: '-1' to enable unlimited swap

4
docs/reference/commandline/network_connect.md
View file

@ -23,8 +23,8 @@ Connect a container to a network
Options: Options:
--alias value Add network-scoped alias for the container (default []) --alias value Add network-scoped alias for the container (default [])
--help Print usage --help Print usage
--ip string IP Address --ip string IPv4 address (e.g., 172.30.100.104)
--ip6 string IPv6 Address --ip6 string IPv6 address (e.g., 2001:db8::33)
--link value Add link to another container (default []) --link value Add link to another container (default [])
--link-local-ip value Add a link-local address for the container (default []) --link-local-ip value Add a link-local address for the container (default [])
``` ```

6
docs/reference/commandline/run.md
View file

@ -76,8 +76,8 @@ Options:
the system uses bytes per second. the system uses bytes per second.
--io-maxbandwidth and --io-maxiops are mutually exclusive options. --io-maxbandwidth and --io-maxiops are mutually exclusive options.
--io-maxiops uint Maximum IOps limit for the system drive (Windows only) --io-maxiops uint Maximum IOps limit for the system drive (Windows only)
--ip string Container IPv4 address (e.g. 172.30.100.104) --ip string IPv4 address (e.g., 172.30.100.104)
--ip6 string Container IPv6 address (e.g. 2001:db8::33) --ip6 string IPv6 address (e.g., 2001:db8::33)
--ipc string IPC namespace to use --ipc string IPC namespace to use
--isolation string Container isolation technology --isolation string Container isolation technology
--kernel-memory string Kernel memory limit --kernel-memory string Kernel memory limit
@ -87,7 +87,7 @@ Options:
--link-local-ip value Container IPv4/IPv6 link-local addresses (default []) --link-local-ip value Container IPv4/IPv6 link-local addresses (default [])
--log-driver string Logging driver for the container --log-driver string Logging driver for the container
--log-opt value Log driver options (default []) --log-opt value Log driver options (default [])
--mac-address string Container MAC address (e.g. 92:d0:c6:0a:29:33) --mac-address string Container MAC address (e.g., 92:d0:c6:0a:29:33)
-m, --memory string Memory limit -m, --memory string Memory limit
--memory-reservation string Memory soft limit --memory-reservation string Memory soft limit
--memory-swap string Swap limit equal to memory plus swap: '-1' to enable unlimited swap --memory-swap string Swap limit equal to memory plus swap: '-1' to enable unlimited swap

6
man/docker-run.1.md
View file

@ -317,12 +317,12 @@ redirection on the host system.
When set to true, keep stdin open even if not attached. The default is false. When set to true, keep stdin open even if not attached. The default is false.
**--ip**="" **--ip**=""
Sets the container's interface IPv4 address (e.g. 172.23.0.9) Sets the container's interface IPv4 address (e.g., 172.23.0.9)
It can only be used in conjunction with **--network** for user-defined networks It can only be used in conjunction with **--network** for user-defined networks
**--ip6**="" **--ip6**=""
Sets the container's interface IPv6 address (e.g. 2001:db8::1b99) Sets the container's interface IPv6 address (e.g., 2001:db8::1b99)
It can only be used in conjunction with **--network** for user-defined networks It can only be used in conjunction with **--network** for user-defined networks
@ -401,7 +401,7 @@ the value of --memory.
unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap. unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
**--mac-address**="" **--mac-address**=""
Container MAC address (e.g. 92:d0:c6:0a:29:33) Container MAC address (e.g., 92:d0:c6:0a:29:33)
Remember that the MAC address in an Ethernet network must be unique. Remember that the MAC address in an Ethernet network must be unique.
The IPv6 link-local address will be based on the device's MAC address The IPv6 link-local address will be based on the device's MAC address