Commit Graph

2214 Commits

Author SHA1 Message Date
allencloud 4cff8fc505 update plugins in docs and correct things in index.md
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a004c15df0
Component: cli
2017-06-02 00:10:47 +00:00
Yong Tang 69c512fa5b Support multiple service IDs on "docker service ps"
This fix tries to address issue raised in 25228 to support
multiple service IDs on `docker service ps`.

Multiple IDs are allowed with `docker service ps ...`, and
related documentation has been updated.

A test has been added to cover the changes.

This fix fixes 25228.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0645bd841e
Component: cli
2017-06-02 00:10:47 +00:00
yuexiao-wang 542d3a8cbd Update reference document for secret and stack
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 1471f8013b
Component: cli
2017-06-02 00:10:47 +00:00
Harald Albers 094303a355 Fix usage message of plugin inspect
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6c5145d074
Component: cli
2017-06-02 00:10:47 +00:00
Harald Albers 407d116751 Add bash completion for plugin disable --force
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0e0cb6498c
Component: cli
2017-06-02 00:10:47 +00:00
Harald Albers f949dc0d1d Fix bash completion for plugin enable|disable
`docker plugin enable` and `docker plugin disable` only
accept one plugin.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 70d8efd001
Component: cli
2017-06-02 00:10:47 +00:00
Sebastiaan van Stijn 2362df6877 document DOCKER_HIDE_LEGACY_COMMANDS env-var
The `DOCKER_HIDE_LEGACY_COMMANDS` environment
variable was added in a7c8bcac2ba60d6dd25a1157085d9245bed556ce
but not documented.

This adds the variable to the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8d4ea9f2cf
Component: cli
2017-06-02 00:10:47 +00:00
Yanqiang Miao 28f7d73273 Complete the document content
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 7957741105
Component: cli
2017-06-02 00:10:47 +00:00
lixiaobing10051267 81eac9ebfb update URL of plugins_graphdriver.md in experimental/README.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: aba799a996
Component: cli
2017-06-02 00:10:47 +00:00
Ovidio Mallo c7464dd765 Reference new DigitalOcean plugin (Closes #29729)
Signed-off-by: Ovidio Mallo <ovidio.mallo@gmail.com>
Upstream-commit: b839363db9
Component: cli
2017-06-02 00:10:47 +00:00
yuexiao-wang c005f02b03 Update the field 'CONTAINER ID' for docker ps
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 6f6cd51db6
Component: cli
2017-06-02 00:10:47 +00:00
zhenghenghuo 9a4c188913 fix some typos
Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>

try to pass test

Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>

try to pass the test

Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>
Upstream-commit: a724a5d8c9
Component: cli
2017-06-02 00:10:46 +00:00
yuexiao-wang 46ae0221fe Update 'ID' field for 'docker plugin ls'
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: fcb3a0e88b
Component: cli
2017-06-02 00:10:46 +00:00
Yong Tang 101c8b0a0e Remove docker stack ps -a to match removal of docker service/node ps -a
In #28507 and #28885, `docker service/node ps -a` has been removed so that
information about slots are show up even without `-a` flag.

The output of `docker stack ps` reused the same output as `docker service/node ps`.
However, the `-a` was still there. It might make sense to remove `docker stack ps -a`
as well to bring consistency with `docker service/node ps`.

This fix is related to #28507, #28885, and #25983.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7e5ce47599
Component: cli
2017-06-02 00:10:46 +00:00
yuexiao-wang 10b208e016 Update the manuals of docker and dockerd
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b193004923
Component: cli
2017-06-02 00:10:46 +00:00
yuexiao-wang bebc564050 Update the index of docker command line
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 348a7520c9
Component: cli
2017-06-02 00:10:46 +00:00
Harald Albers 7dc9264d52 Add bash completion for plugin install --alias
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b78f47ca4a
Component: cli
2017-06-02 00:10:46 +00:00
Harald Albers f79865561d Cleanup bash completion for service create|update
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 73a5149c50
Component: cli
2017-06-02 00:10:46 +00:00
Yanqiang Miao 9bff074ec1 Add 'volume prune' to the volume commands index
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 93ca1a3122
Component: cli
2017-06-02 00:10:46 +00:00
Brian Goff 94c8461a3d Moves graphdriver plugn docs out of experimental
Also updates some of the structures being sent so plugins are getting
all the new options.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: a59544ff3d
Component: cli
2017-06-02 00:10:46 +00:00
Tonis Tiigi 0a588f27d2 Implement content addressability for plugins
Move plugins to shared distribution stack with images.

Create immutable plugin config that matches schema2 requirements.

Ensure data being pushed is same as pulled/created.

Store distribution artifacts in a blobstore.

Run init layer setup for every plugin start.

Fix breakouts from unsafe file accesses.

Add support for `docker plugin install --alias`

Uses normalized references for default names to avoid collisions when using default hosts/tags.

Some refactoring of the plugin manager to support the change, like removing the singleton manager and adding manager config struct.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: b5b3dd4c6b
Component: cli
2017-06-02 00:10:46 +00:00
Anusha Ragunathan 9488b60ad6 Enforce zero plugin refcount during disable.
When plugins have a positive refcount, they were not allowed to be
removed. However, plugins could still be disabled when volumes
referenced it and containers using them were running.

This change fixes that by enforcing plugin refcount during disable.
A "force" disable option is also added to ignore reference refcounting.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: e31e2d5bd4
Component: cli
2017-06-02 00:10:46 +00:00
Victoria Bialas 96451aedeb followup to incorporate review comments per previous reviews on PR#29561
incorporated review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 40f445d605
Component: cli
2017-06-02 00:10:46 +00:00
Zhang Wei 3000095596 Add missing "--default-runtime" flag in manpage
Add missing flag and more descriptions in manpage.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: ef5fb30f61
Component: cli
2017-06-02 00:10:46 +00:00
Misty Stanley-Jones b768cd6312 Clarify what docker diff shows
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: fbb21b0191
Component: cli
2017-06-02 00:10:46 +00:00
yuexiao-wang 34f384e6dd Add the link for swarm reference document
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 9d27f13dd8
Component: cli
2017-06-02 00:10:46 +00:00
yuexiao-wang 661f4003fc Change tls to TLS
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 0a6612f03f
Component: cli
2017-06-02 00:10:46 +00:00
Harald Albers 1e4ad9ea7d Improve bash completion for bundled plugins
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 388c8f8a30
Component: cli
2017-06-02 00:10:46 +00:00
Hongbin Lu 2998f50108 Add Fuxi Volume Plugin to the docs
Signed-off-by: Hongbin Lu <hongbin034@gmail.com>
Upstream-commit: 08ba19c291
Component: cli
2017-06-02 00:10:45 +00:00
Xinbo Weng 67af87398f some punctuation errors and a verb form error
Signed-off-by: Xinbo Weng <xihuanbo_0521@zju.edu.cn>
Upstream-commit: e3d6fbd44f
Component: cli
2017-06-02 00:10:45 +00:00
Jie Luo ec418efe9e duplicated the
Signed-off-by: Jie Luo <luo612@zju.edu.cn>

typo

Signed-off-by: Jie Luo <luo612@zju.edu.cn>

fix some typos

Signed-off-by: Jie Luo <luo612@zju.edu.cn>
Upstream-commit: 22b1d28bde
Component: cli
2017-06-02 00:10:45 +00:00
Victoria Bialas 2382f08b14 updates to d4win description per review comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 0be1dede62
Component: cli
2017-06-02 00:10:45 +00:00
Victoria Bialas 4c1c7e3c26 updates to glossary re: d4mac, d4win, toolbox per user request
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 205d49dfa0
Component: cli
2017-06-02 00:10:45 +00:00
Yong Tang c462ad6f63 Fix misleading default for --replicas
This fix tries to address the issue raised in 29291 where
the output of `--replicas` in `service create/update`:
```
      --replicas uint                    Number of tasks (default none)
```
is misleading. User might incorrectly assume the number of replicas
would be `0` (`none`) by default, while the actual default is `1`.

The issue comes from the fact that some of the default values are
from daemon and it is not possible for client to find out the default
value.

In this case, it might be better to just simply not displaying `(default none)`.

This fix returns "" for `Uint64Opt` so that `(default none)` is hidden.

In addition to `--replicas`, this fix also changes
`--restart-delay`, `--restart-max-attempts`, `--stop-grace-period`,
`--health-interval`, `--health-timeout`, and `--restart-window`
in a similiar fashion.

New Output:
```
      --health-interval duration         Time between running the check (ns|us|ms|s|m|h)
      --health-timeout duration          Maximum time to allow one check to run (ns|us|ms|s|m|h)
...
      --replicas uint                    Number of tasks
...
      --restart-delay duration           Delay between restart attempts (ns|us|ms|s|m|h)
      --restart-max-attempts uint        Maximum number of restarts before giving up
      --restart-window duration          Window used to evaluate the restart policy (ns|us|ms|s|m|h)
...
      --stop-grace-period duration       Time to wait before force killing a container (ns|us|ms|s|m|h)
```

The docs has been updated. Note the docs for help output of `service create/update`
is out of sync with the current master. This fix replace with the update-to-date
help output.

This fix fixes 29291.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 87b4281f62
Component: cli
2017-06-02 00:10:45 +00:00
liwenqi d30480f44f correct some words
Signed-off-by: liwenqi <vikilwq@zju.edu.cn>

Update ISSUE-TRIAGE.md

Signed-off-by: vicky <395658237@qq.com>
Upstream-commit: 1b85eea07d
Component: cli
2017-06-02 00:10:45 +00:00
lixiaobing10051267 73b9490c31 field NAMES ommitted after docker ps in commit.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 41d0180f2a
Component: cli
2017-06-02 00:10:45 +00:00
allencloud 16f46460cc update docs about --oom-score-adj
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 175d21838a
Component: cli
2017-06-02 00:10:45 +00:00
Harald Albers 097129d37e Remove bash completion for deprecated docker daemon
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5997147397
Component: cli
2017-06-02 00:10:45 +00:00
lixiaobing10051267 57b5fdb41c Add docker-update description ommited in docker.1.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: f03fd566f6
Component: cli
2017-06-02 00:10:45 +00:00
Harald Albers 70afe5fd31 Remove --all|-a from docker node ps reference
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7a9de26c6e
Component: cli
2017-06-02 00:10:45 +00:00
Michael 8ddacc9277 [docs,man] Fixed typo (#29516)
Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de>
Upstream-commit: b9c6e9ef21
Component: cli
2017-06-02 00:10:45 +00:00
Harald Albers defa099008 Remove bash completion for docker node ps --all|-a
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8e57564708
Component: cli
2017-06-02 00:10:45 +00:00
Yong Tang c530b42113 Add --file flag for docker secret create command
This fix tries to address the issue raised in 28581 and 28927
where it is not possible to create a secret from a file (only
through STDIN).

This fix add a flag `--file` to `docker secret create` so that
it is possible to create a secret from a file with:
```
docker secret create --file secret.in secret.name
```

or
```
echo TEST | docker secret create --file - secret.name
```

Related docs has been updated.

An integration test has been added to cover the changes.

This fix fixes 28581.
This fix is related to 28927.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c8f99f00d2
Component: cli
2017-06-02 00:10:45 +00:00
Akihiro Suda 83531e1695 update experimental/README.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: fd0957a407
Component: cli
2017-06-02 00:10:45 +00:00
Sebastiaan van Stijn 7f47625faa swarm leave is not only for workers
the "docker swarm leave" command description
mentioned that the command can only be used
for workers, however, the command can also
be used for managers (using the `-f` / `--force`
option).

this patch removes the "(workers only)" part
of the command description.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0d964441e9
Component: cli
2017-06-02 00:10:45 +00:00
yuexiao-wang 5b8e4af26b Fix inconsistency for pause and unpause
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: dd1e172adb
Component: cli
2017-06-02 00:10:45 +00:00
yuexiao-wang b68c5d52fe Add the whole related information for node
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: a3246c7c3d
Component: cli
2017-06-02 00:10:44 +00:00
yuexiao-wang 21013bc0e4 Add the link for service logs
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 932211ddc7
Component: cli
2017-06-02 00:10:44 +00:00
Trapier Marshall 84477efeb4 fix typo in reference for service create
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
Upstream-commit: e1eea7b951
Component: cli
2017-06-02 00:10:44 +00:00
Harald Albers e0a7ab71aa Add docs for docker network create --attachable
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a325d3ea2a
Component: cli
2017-06-02 00:10:44 +00:00