Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,195 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

603 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
Akihiro Suda 0e7bbb55c8 cli: add `--mount` to `docker run` 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-06-02 00:10:31 +00:00
John Howard 8da2e039e5 Redirect powershell completion 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-06-02 00:10:31 +00:00
allencloud ef09aafc3e add replicated in service scale command description 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-06-02 00:10:31 +00:00
allencloud 6cf2234377 node rm can be applied on not only active node 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-06-02 00:10:31 +00:00
Steve Durrheimer 33964db9d0 Add zsh completion for 'docker ps --filter health=' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-06-02 00:10:31 +00:00
Harald Albers 7cb11128f7 Add bash completion for `docker ps --filter health` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:31 +00:00
Lily Guo 0e1a3f6bbb Service create --group param 
--group-add was used for specifying groups for both service create
and service update. For create it was confusing since we don't have
an existing set of groups. Instead I added --group to create, and
moved --group-add to service update only, like --group-rm
This deals with issue 27646

Signed-off-by: Lily Guo <lily.guo@docker.com>

Update flag documentation

Specify that --group, --group-add and --groupd-rm refers to
supplementary user groups

Signed-off-by: Lily Guo <lily.guo@docker.com>

Fix docs for groups and update completion scripts

Signed-off-by: Lily Guo <lily.guo@docker.com>
 2017-06-02 00:10:30 +00:00
Cezar Sa Espinola 836b1a7d0a Add --health-* commands to service create and update 
A HealthConfig entry was added to the ContainerSpec associated with the
service being created or updated.

Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
 2017-06-02 00:10:30 +00:00
Harald Albers bf5201d2cf Add bash completion for `docker export --output` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:30 +00:00
Harald Albers 5b3976457c Add support for multiple containers to bash completion for `docker pause` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:30 +00:00
Harald Albers 7e7a47405a Add bash completion for `docker service create --env-file` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:30 +00:00
Steve Durrheimer da7306052f Add zsh completion for 'docker service create --env-file' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-06-02 00:10:30 +00:00
Ce Gao d398440f03 fixes #27643 
Signed-off-by: Ce Gao <ce.gao@outlook.com>
 2017-06-02 00:10:29 +00:00
Sebastiaan van Stijn 6fbb9227cb Remove --name flag from service update 
The --name flag was inadvertently added to
docker service update, but is not supported,
as it has various side-effects (e.g., existing
tasks are not renamed).

This removes the flag from the service update
command.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-02 00:10:29 +00:00
Harald Albers bce3414931 Move bash completion logic to new subcommand: info 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers 95f885eb9b Move bash completion logic to new subcommand: events 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers 9e164dedaa Add bash completion for new `docker system` command family 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers 398d4706d3 Move bash completion logic to new subcommand: tag 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers 54bb65787c Move bash completion logic to new subcommand: save 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers 52c1a7ed50 Move bash completion logic to new subcommand: rmi 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers 509d2cc9b6 Move bash completion logic to new subcommand: push 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers 3ed53e5641 Move bash completion logic to new subcommand: pull 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers ff05fa31d5 Move bash completion logic to new subcommand: images 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers eeae0d4c53 Move bash completion logic to new subcommand: load 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers 918ff45c1a Delegate bash completion for `docker {container,image} inspect` to parameterized function 
In #23614 `docker inspect` was semantically enhanced to inspect "everything".
Therefore moving its logic to `_docker_container_inspect` was not correct.

This commit moves it back to its original top-level location (`_docker_inspect`)
so that it can be called by `_docker_{container,image}_inspect` and others (will
be added in follow-up PRs).
Parameterization was added in order to get caller-specific behavior.

Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers e8310f310d Move bash completion logic to new subcommand: import 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers 583bda0896 Move bash completion logic to new subcommand: history 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:29 +00:00
Harald Albers bd3939dddd Move bash completion logic to new subcommand: build 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:28 +00:00
Harald Albers 3ab25a8ccb Add bash completion for new `docker image` command family 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:28 +00:00
Erik St. Martin 42ef78911e Implementing support for --cpu-rt-period and --cpu-rt-runtime so that 
containers may specify these cgroup values at runtime. This will allow
processes to change their priority to real-time within the container
when CONFIG_RT_GROUP_SCHED is enabled in the kernel. See #22380.

Also added sanity checks for the new --cpu-rt-runtime and --cpu-rt-period
flags to ensure that that the kernel supports these features and that
runtime is not greater than period.

Daemon will support a --cpu-rt-runtime flag to initialize the parent
cgroup on startup, this prevents the administrator from alotting runtime
to docker after each restart.

There are additional checks that could be added but maybe too far? Check
parent cgroups to ensure values are <= parent, inspecting rtprio ulimit
and issuing a warning.

Signed-off-by: Erik St. Martin <alakriti@gmail.com>
 2017-06-02 00:10:28 +00:00
Steve Durrheimer 85fb527cbf Add zsh completion for 'dockerd --experimental' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-06-02 00:10:28 +00:00
Steve Durrheimer 350b1a3f38 Add zsh completion for 'dockerd --shutdown-timeout' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-06-02 00:10:28 +00:00
Steve Durrheimer fa8f0cd060 Add zsh completion for 'docker {create,run} --stop-timeout' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-06-02 00:10:28 +00:00
Harald Albers 7414101f3c Add bash completion for `dockerd --experimental` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:28 +00:00
Steve Durrheimer add78ffc8a Fix zsh completion for 'docker exec --env' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-06-02 00:10:28 +00:00
Harald Albers 04b0779de4 Fix bash completion for `docker exec --env` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:28 +00:00
Aaron Lehmann 78c0d50c9f Add force option to service update 
Currently, there's no way to restart the tasks of a service without
making an actual change to the service. This leads to us giving awkward
workarounds as in
https://github.com/docker/docker.github.io/pull/178/files, where we tell
people to scale a service up and down to restore balance, or make
unnecessary changes to trigger a restart.

This change adds a --force option to "docker service update", which
forces the service to be updated even if no changes require that.

Since rolling update parameters are respected, the user can use
"docker service --force" to do a rolling restart. For example, the
following is supported:

   docker service update --force --update-parallelism 2 \
   --update-delay 5s myservice

Since the default value of --update-parallelism is 1, the default
behavior is to restart the service one task at a time.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-06-02 00:10:27 +00:00
Harald Albers 4f4c129973 Move bash completion logic to new subcommand: wait 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers d2ef5775b8 Move bash completion logic to new subcommand: update 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers b8d3d1e6ec Move bash completion logic to new subcommand: unpause 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers 28cf2654e7 Move bash completion logic to new subcommand: top 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers 620d0051c8 Move bash completion logic to new subcommand: stop 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers 04886bca2f Move bash completion logic to new subcommand: stats 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers f58b6746d7 Move bash completion logic to new subcommand: start 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers 05656756e6 Move bash completion logic to new subcommand: run 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers 39880d7731 Move bash completion logic to new subcommand: rm 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers 2a9e70cf34 Move bash completion logic to new subcommand: restart 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers f533df0821 Move bash completion logic to new subcommand: port 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers 120b57a61c Move bash completion logic to new subcommand: port 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00
Harald Albers b659865f57 Move bash completion logic to new subcommand: pause 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:10:27 +00:00