Commit Graph

553 Commits

Author SHA1 Message Date
Yong Tang ebacbb50ae Add `--dns-option` to `docker run` and hide `--dns-opt`
This fix is a follow up to #27567 based on:
https://github.com/docker/docker/pull/27567#issuecomment-259295055

In #27567, `--dns-options` has been added to `service create/update`,
together with `--dns` and `--dns-search`. The `--dns-opt` was used
in `docker run`.

This fix add `--dns-option` (not `--dns-options`) to `docker run/create`, and hide
`--dns-opt`. It is still possible to use `--dns-opt` with
`docker run/create`, though it will not show up in help output.

This fix change `--dns-options`to --dns-option` for `docker service create`
and `docker service update`.

This fix also updates the docs and bash/zsh completion scripts.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-06-02 00:10:36 +00:00
Harald Albers e64c21b045 Add bash completion for `docker {node rm,swarm leave} -f`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:36 +00:00
Steve Durrheimer cd0ef2a337 Cleanup after moving all zsh completion logics for the new image command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer e3711a11f2 Move zsh completion logic to new subcommand: tag
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer a3e4ac1d2f Move zsh completion logic to new subcommand: save
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer f812608ff4 Move zsh completion logic to new subcommand: rm
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer 82dfd60819 Move zsh completion logic to new subcommand: push
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer e3d224e520 Move zsh completion logic to new subcommand: pull
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer 47364fcb71 Move zsh completion logic to new subcommand: ls
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer e21d331b1e Move zsh completion logic to new subcommand: load
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer 8fa658335b Add zsh completion logic to new subcommand: inspect
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer f8829f20b4 Move zsh completion logic to new subcommand: import
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer 4d4d5b199e Move zsh completion logic to new subcommand: history
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer 9d35c2f68b Move zsh completion logic to new subcommand: build
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer fafe5a16f3 Add zsh completion for 'docker image' subcommands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Steve Durrheimer e8388b10d6 Rename zsh images & log complete functions
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:35 +00:00
Aaron Lehmann 49b6be893c cli: Add options for Raft snapshotting
Add the following options to "swarm init" and "swarm update":

- --max-snapshots: Retain this many old Raft snapshots in addition
  to the latest one

- --snapshot-interval: Number of log entries between Raft snapshots

These options already existed in SwarmKit and the Docker API but were
never exposed in the CLI. I'm adding them here to fix this oversight.

--max-snapshots may be useful for debugging purposes and more
conservative users who want to store rolling backups of old versions of
the Raft state.

--snapshot-interval is most useful for performance tuning. The default
value of 10000 may not be ideal for some setups.

There is also a LogEntriesForSlowFollowers option that is not exposed. I
decided not to expose it along with these others because I don't think
it's generally useful (and I'm not sure what I would call the CLI flag).
But if people want, I can expose it for the sake of completeness.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer 53846847ba Cleanup after moving all zsh completion logics for the new container command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer dab4176180 Move zsh completion logic to new subcommand: wait
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer 643725b6a8 Move zsh completion logic to new subcommand: update
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer fe0cfed70c Move zsh completion logic to new subcommand: top
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer 8361fc40e7 Move zsh completion logic to new subcommand: stop
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer 5323c46677 Move zsh completion logic to new subcommand: stats
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer 2fd33da75f Move zsh completion logic to new subcommand: start
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer 15a2f1f74f Move zsh completion logic to new subcommand: run
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer 4149666da1 Move zsh completion logic to new subcommand: rm
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer b3b41803ed Move zsh completion logic to new subcommand: restart
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer 25fc254d3a Move zsh completion logic to new subcommand: rename
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:34 +00:00
Steve Durrheimer 64ea2f57e8 Move zsh completion logic to new subcommand: port
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer 67a2df2d80 Move zsh completion logic to new subcommand: pause, unpause
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer f7dba85a99 Move zsh completion logic to new subcommand: ps
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer a01c52a1a6 Move zsh completion logic to new subcommand: logs
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer ca352f2941 Move zsh completion logic to new subcommand: kill
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer 61507603fb Add zsh completion logic to new subcommand: inspect
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer 13a60cfa38 Move zsh completion logic to new subcommand: export
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer f2cebb1b32 Move zsh completion logic to new subcommand: exec
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer 978fbdd9dc Move zsh completion logic to new subcommand: diff
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer 6e850a9613 Move zsh completion logic to new subcommand: create
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer 2d250dcaf1 Move zsh completion logic to new subcommand: cp
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer aee4d2e078 Move zsh completion logic to new subcommand: commit
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer f80a33998f Move zsh completion logic to new subcommand: attach
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer cfb9ce1683 Add zsh completion for 'docker container' subcommands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Steve Durrheimer b5721467b2 Rename containers complete function in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:33 +00:00
Harald Albers 308b0edef8 Add bash completion for `docker service {create,update} --tty`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:33 +00:00
Harald Albers 1194369887 Add bash completion for `docker {run,create} --cpus`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:32 +00:00
Harald Albers fcf085a9f5 Add bash completion for `docker system df`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:32 +00:00
Harald Albers 8b4362795c Add bash completion for new prune commands
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:32 +00:00
Harald Albers 2bf6e4c769 Fix bash completion for `docker inspect --type`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:32 +00:00
Harald Albers 857febc7d7 Add bash completion for `docker service create --hostname`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:32 +00:00
yupeng af5af201fe Add for String
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2017-06-02 00:10:31 +00:00