Commit Graph

1991 Commits

Author SHA1 Message Date
6336325257 Change to plural forms for help output of docker service update
This fix is based on the comment in
https://github.com/docker/docker/pull/27567#discussion_r86910604

Basically, in the help output of `docker service update`, the `--xxx-add`
flags typically have plural forms while `--xxx-rm` flags have singular
forms.

This fix updates the help output for consistency.

This fix also updates the related docs in `service_update.md`.
The help output in `service_update.md` has been quite out-of-sync
with the actual output so this fix replaces the output with the
most up-to-date output.

This fix is related to #27567.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e2f6503609
Component: cli
2017-06-02 00:10:34 +00:00
3d48ab983d support show numbers of global service in service ls command
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 5af84edf26
Component: cli
2017-06-02 00:10:34 +00:00
4fc12cf63a Update for docker checkpoint
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 010340e304
Component: cli
2017-06-02 00:10:34 +00:00
e0f3694584 Cleanup after moving all zsh completion logics for the new container command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 53846847ba
Component: cli
2017-06-02 00:10:34 +00:00
78af9de521 Move zsh completion logic to new subcommand: wait
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: dab4176180
Component: cli
2017-06-02 00:10:34 +00:00
0c6f9f1c31 Move zsh completion logic to new subcommand: update
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 643725b6a8
Component: cli
2017-06-02 00:10:34 +00:00
bb1dc27571 Move zsh completion logic to new subcommand: top
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: fe0cfed70c
Component: cli
2017-06-02 00:10:34 +00:00
16ec789afc Move zsh completion logic to new subcommand: stop
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8361fc40e7
Component: cli
2017-06-02 00:10:34 +00:00
85365f2838 Move zsh completion logic to new subcommand: stats
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 5323c46677
Component: cli
2017-06-02 00:10:34 +00:00
45c78f761d Move zsh completion logic to new subcommand: start
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2fd33da75f
Component: cli
2017-06-02 00:10:34 +00:00
c38610b30f Move zsh completion logic to new subcommand: run
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 15a2f1f74f
Component: cli
2017-06-02 00:10:34 +00:00
82abd6f24e Move zsh completion logic to new subcommand: rm
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 4149666da1
Component: cli
2017-06-02 00:10:34 +00:00
d815c07020 Move zsh completion logic to new subcommand: restart
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b3b41803ed
Component: cli
2017-06-02 00:10:34 +00:00
a122f1ef7f Move zsh completion logic to new subcommand: rename
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 25fc254d3a
Component: cli
2017-06-02 00:10:34 +00:00
0b306848cf Move zsh completion logic to new subcommand: port
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 64ea2f57e8
Component: cli
2017-06-02 00:10:33 +00:00
9102df60de Move zsh completion logic to new subcommand: pause, unpause
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 67a2df2d80
Component: cli
2017-06-02 00:10:33 +00:00
008f90d90a Move zsh completion logic to new subcommand: ps
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f7dba85a99
Component: cli
2017-06-02 00:10:33 +00:00
4056fe032c Move zsh completion logic to new subcommand: logs
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: a01c52a1a6
Component: cli
2017-06-02 00:10:33 +00:00
afffeb8b0a Move zsh completion logic to new subcommand: kill
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ca352f2941
Component: cli
2017-06-02 00:10:33 +00:00
78502c6241 Add zsh completion logic to new subcommand: inspect
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 61507603fb
Component: cli
2017-06-02 00:10:33 +00:00
a94b3ec3b7 Move zsh completion logic to new subcommand: export
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 13a60cfa38
Component: cli
2017-06-02 00:10:33 +00:00
94bb7c7521 Move zsh completion logic to new subcommand: exec
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f2cebb1b32
Component: cli
2017-06-02 00:10:33 +00:00
3be359b2bd Move zsh completion logic to new subcommand: diff
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 978fbdd9dc
Component: cli
2017-06-02 00:10:33 +00:00
4b72f461e9 Move zsh completion logic to new subcommand: create
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 6e850a9613
Component: cli
2017-06-02 00:10:33 +00:00
ce8ab479d9 Move zsh completion logic to new subcommand: cp
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2d250dcaf1
Component: cli
2017-06-02 00:10:33 +00:00
1e64399cfe Move zsh completion logic to new subcommand: commit
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: aee4d2e078
Component: cli
2017-06-02 00:10:33 +00:00
2c7deb1a7f Move zsh completion logic to new subcommand: attach
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f80a33998f
Component: cli
2017-06-02 00:10:33 +00:00
d118aedb07 Add zsh completion for 'docker container' subcommands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: cfb9ce1683
Component: cli
2017-06-02 00:10:33 +00:00
656246aef3 Rename containers complete function in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b5721467b2
Component: cli
2017-06-02 00:10:33 +00:00
18a87897fc Add bash completion for docker service {create,update} --tty
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 308b0edef8
Component: cli
2017-06-02 00:10:33 +00:00
233e18f1ff Add --tty to docker service create/update
This fix tries to add `--tty` to `docker service create/update`. As was
specified in 25644, `TTY` flag has been added to SwarmKit and is
already vendored.

This fix add `--tty` to `docker service create/update`.

Related document has been updated.

Additional integration tests has been added.

This fix fixes 25644.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7443d74e2d
Component: cli
2017-06-02 00:10:33 +00:00
2fc68b8590 support env for docker plugin set
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 809dee7e20
Component: cli
2017-06-02 00:10:32 +00:00
acbe6a8c1a remove COMMAND column from service ls output. closes #27994
Signed-off-by: Alicia Lauerman <alicia@eta.im>
Upstream-commit: 5ad8af8fd1
Component: cli
2017-06-02 00:10:32 +00:00
f6db982a85 Add -a option to service/node ps
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: b7c6c84fdd
Component: cli
2017-06-02 00:10:32 +00:00
5b7fe391d6 Rectify Images display information for docker 1.10.3
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 55d4ce14dd
Component: cli
2017-06-02 00:10:32 +00:00
fba6b9ab39 Add bash completion for docker {run,create} --cpus
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1194369887
Component: cli
2017-06-02 00:10:32 +00:00
f4e29ea739 Add bash completion for docker system df
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: fcf085a9f5
Component: cli
2017-06-02 00:10:32 +00:00
580a505e9b Add bash completion for new prune commands
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8b4362795c
Component: cli
2017-06-02 00:10:32 +00:00
87033ac373 Fix bash completion for docker inspect --type
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2bf6e4c769
Component: cli
2017-06-02 00:10:32 +00:00
9ec26ffaf2 Update docs for the output of docker build (Step 1/...)
PR 24978 adds hint of of progress to the output of `docker build`
for 1.13, in the format of
```
Step 1/5 ...
...
Step 2/5 ...
...
```

Though some of the docs hasn't been updated.

This fix did a grep in docs and updated the related places.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4139784154
Component: cli
2017-06-02 00:10:32 +00:00
17f22ba07a Align arg with other cli
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: f5298c5f4d
Component: cli
2017-06-02 00:10:32 +00:00
190608ece5 Windows: Add cpu count option
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 09e1fc1540
Component: cli
2017-06-02 00:10:32 +00:00
829f4efead modify URL because installation directory removed
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 7b024c69ee
Component: cli
2017-06-02 00:10:32 +00:00
eed4179b98 Add bash completion for docker service create --hostname
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 857febc7d7
Component: cli
2017-06-02 00:10:32 +00:00
b1abdb7217 Add --cpus flag to control cpu resources
This fix tries to address the proposal raised in 27921 and add
`--cpus` flag for `docker run/create`.

Basically, `--cpus` will allow user to specify a number (possibly partial)
about how many CPUs the container will use. For example, on a 2-CPU system
`--cpus 1.5` means the container will take 75% (1.5/2) of the CPU share.

This fix adds a `NanoCPUs` field to `HostConfig` since swarmkit alreay
have a concept of NanoCPUs for tasks. The `--cpus` flag will translate
the number into reused `NanoCPUs` to be consistent.

This fix adds integration tests to cover the changes.

Related docs (`docker run` and Remote APIs) have been updated.

This fix fixes 27921.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d93d09acaa
Component: cli
2017-06-02 00:10:32 +00:00
0ce8491828 daemon: add a flag to override the default seccomp profile
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 9ba2472a0b
Component: cli
2017-06-02 00:10:32 +00:00
7512a6b872 Adding the hostname option to docker service command
Signed-off-by: Nikolay Milovanov <nmil@itransformers.net>
Upstream-commit: ea6fc78b8f
Component: cli
2017-06-02 00:10:32 +00:00
8bc7f37f93 project: use vndr for vendoring
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b823284d4a
Component: cli
2017-06-02 00:10:32 +00:00
35146fe359 fix frontmatter keywords value type (string, instead of []string) in /docs/reference
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 572c6bb89a
Component: cli
2017-06-02 00:10:31 +00:00
10117b8d2f fix frontmatter keywords value type (string, instead of []string)
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 4126b5526c
Component: cli
2017-06-02 00:10:31 +00:00