Commit Graph

2202 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
dfec30521c Make bash completion for docker stack deploy --bundle-file experimental
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ea5be8f75f
Component: cli
2017-06-02 00:10:44 +00:00
77de2eabdc Remove --port and update --publish for services to support syntaxes
Add support for simple and complex syntax to `--publish` through the
use of `PortOpt`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b837f7456d
Component: cli
2017-06-02 00:10:44 +00:00
1d2468df13 Update the manual for docker wait
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: fe9be95dec
Component: cli
2017-06-02 00:10:44 +00:00
cdc8c82fea Update reference docs for service ps
commit bbd2018ee19eff5594ae3986bf56fbcd0044699d
changed the output format of `docker service ps`.

this patch updates the reference docs
to match the updated output format.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: baea245377
Component: cli
2017-06-02 00:10:44 +00:00
668d35e913 Fix the incorrect option name
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4df2866d4e
Component: cli
2017-06-02 00:10:44 +00:00
9f81289a72 stack_config.md not exist and delete it
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: d408f74d07
Component: cli
2017-06-02 00:10:44 +00:00
6c42c738d3 deprecate "top-level" network information in NetworkSettings
When inspecting a container, `NetworkSettings` contains top-level
information about the default ("bridge") network;

`EndpointID`, `Gateway`, `GlobalIPv6Address`, `GlobalIPv6PrefixLen`,
`IPAddress`, `IPPrefixLen`, `IPv6Gateway`, and `MacAddress`.

These properties are deprecated in favor of per-network properties in
`NetworkSettings.Networks`. These properties were already "deprecated" in
docker 1.9, but kept around for backward compatibility.

Refer to [#17538](https://github.com/docker/docker/pull/17538) for further
information.

This officially deprecates these properties, and marks them
for removal in 1.16

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 96d5009f10
Component: cli
2017-06-02 00:10:44 +00:00
a8153231ae Update the option 'network' for docker build
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 378a9d816b
Component: cli
2017-06-02 00:10:44 +00:00
bd7f8f8f9e remove old media type compat for plugins
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 5bfa17e58b
Component: cli
2017-06-02 00:10:44 +00:00
5f243da8df fix some broken contents links
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>

fix-contents-links

Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>
Upstream-commit: 2d40fc55b8
Component: cli
2017-06-02 00:10:44 +00:00
09cfe3454c docs: fix description of docker swarm update --help
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: 967a6bf70d
Component: cli
2017-06-02 00:10:44 +00:00
9012475dbc docs: fix description of docker swarm join --help
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: b81f7aba37
Component: cli
2017-06-02 00:10:44 +00:00