Commit Graph

1525 Commits

Author SHA1 Message Date
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
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
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
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
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
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
f865a2ecbe replace env description with args in extend config
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 2373288938
Component: cli
2017-06-02 00:10:44 +00:00
47e77de42d plugins: container-rootfs-relative paths
Legacy plugins expect host-relative paths (such as for Volume.Mount).
However, a containerized plugin cannot respond with a host-relative
path. Therefore, this commit modifies new volume plugins' paths in Mount
and List to prepend the container's rootfs path.

This introduces a new PropagatedMount field in the Plugin Config.
When it is set for volume plugins, RootfsPropagation is set to rshared
and the path specified by PropagatedMount is bind-mounted with rshared
prior to launching the container. This is so that the daemon code can
access the paths returned by the plugin from the host mount namespace.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 5a84f77819
Component: cli
2017-06-02 00:10:43 +00:00
6f86448579 fix some version information
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>
Upstream-commit: 1ca2bb4e0b
Component: cli
2017-06-02 00:10:43 +00:00
857189b456 Add credential helper documentation
Signed-off-by: Jake Sanders <jsand@google.com>
Upstream-commit: 5ee07f7a96
Component: cli
2017-06-02 00:10:43 +00:00
c7e1b80d2b add SCOPE field content for docker network ls
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 6cc17b6549
Component: cli
2017-06-02 00:10:43 +00:00
3beb7410fd Fix a spelling mistake in the docs.
Signed-off-by: Chris Gavin <chris@chrisgavin.me>
Upstream-commit: 0a75b0264f
Component: cli
2017-06-02 00:10:43 +00:00
1573881706 Add ID field for docker plugin ls
This fix tries to address the enhancement proposed in 28708 to display
ID field for the output of `docker plugin ls`.

This fix add `ID` field to the output of `docker plugin ls`

Related docs has been updated.

This fix fixes 28708.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 21b9ce971e
Component: cli
2017-06-02 00:10:43 +00:00
a5a4a6d8b1 Allow docker plugin inspect to search based on ID or name
This fix tries to address the issue raised in discussion of
PR 28735 where it was not possible to manage plugin based on
plugin ID. Previously it was not possible to invoke
`docker plugin inspect` with a plugin ID (or ID prefix).

This fix updates the implementation of `docker plugin inspect`
so that it is possbile to search based on a plugin name, or a
plugin ID. A short format of plugin ID (prefix) is also possible,
as long as there is no ambiguity.

Previously the check of `docker plugin inspect` was mostly done
on the client side. This could potentially cause inconsistency
between API and CMD. This fix move all the checks to daemon side
so that API and CMD will be consistent.

An integration test has been added to cover the changes.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 5d6468af96
Component: cli
2017-06-02 00:10:43 +00:00
f0cf23a7f8 Fix the inconsistency for docker secret
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 021d177ed1
Component: cli
2017-06-02 00:10:43 +00:00
f8a989f686 Revert "Add -a option to service/node ps"
This reverts commit 139fff2bf0ebe12b61871ba8ec8be8d51c2338db.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5ee218987d
Component: cli
2017-06-02 00:10:42 +00:00
f60e8dbe1d cli: remove --mount from docker run
This commit reverts 273eeb813c1db0f42c2ad5e053972eeb00907568 (#26825).
For the discussion so far, please refer to #28527.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: a5053dce24
Component: cli
2017-06-02 00:10:42 +00:00
58d2d0498d Windows: Note about volumes in run
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 64a17b65c3
Component: cli
2017-06-02 00:10:42 +00:00
9bc2b4dd44 Fix some format errors
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: e248501799
Component: cli
2017-06-02 00:10:42 +00:00
ecf6047eb5 Modify the link for config.json
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4abd9ea9a9
Component: cli
2017-06-02 00:10:42 +00:00
eb04210a4f Document publishing a UDP port
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 4f414e56d4
Component: cli
2017-06-02 00:10:42 +00:00
9d6e16b26b update plugin example
Signed-off-by: Victor Vieux <victorvieux@gmail.com>

cleanup whitespace formatting

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b82e761088
Component: cli
2017-06-02 00:10:42 +00:00
94ebef2849 Fix instances of doubled words
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: d2ff281196
Component: cli
2017-06-02 00:10:42 +00:00
b3d421b217 Fix copypaste error 'is-automated'
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 4c71c95e34
Component: cli
2017-06-02 00:10:42 +00:00
7b298b591a Fix some redirect loops and problems
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: d5b3df0c2f
Component: cli
2017-06-02 00:10:42 +00:00
0fb89a4b6a Modify reponame to PLUGIN and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: f93df409b4
Component: cli
2017-06-02 00:10:41 +00:00
78fa1e6bc3 Remove docker stack config commandline reference doc
`docker stack config` command does not exists anymore, removing it
from the command reference documentation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 30f5338c8e
Component: cli
2017-06-02 00:10:41 +00:00
676c6b6639 Add aliases and options to docker stack ls docs
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7e37dd4329
Component: cli
2017-06-02 00:10:41 +00:00
211a0054ef fix more according to the actual output of 'docker swarm init --help'
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: bd6d56c796
Component: cli
2017-06-02 00:10:41 +00:00
957972b662 fix description of 'docker swarm init'
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: 2e2b706917
Component: cli
2017-06-02 00:10:41 +00:00
fe9a20e2a3 Fix a description of 'docker run [-a]'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 43a8f3b028
Component: cli
2017-06-02 00:10:41 +00:00
3fe6f140a8 modify invalid url in plugins_network.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: be6e3311f2
Component: cli
2017-06-02 00:10:41 +00:00
4cd5f70633 support src in --secret
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 8628703ce6
Component: cli
2017-06-02 00:10:41 +00:00
e26a9844a0 Add a short flag for docker stack deploy
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c41fa83e4d
Component: cli
2017-06-02 00:10:41 +00:00
6b8c97466e Allow hostname to be updated on service.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f31ed0b125
Component: cli
2017-06-02 00:10:41 +00:00
29ae5e081e Fix some syntax error
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 4b3c9059a9
Component: cli
2017-06-02 00:10:41 +00:00
acac183c62 Update docs of docker network ls --filter
Currently the help output of `docker network ls --filter` is:
```
Options:
  -f, --filter value   Provide filter values (i.e. 'dangling=true') (default [])
  ...
```
This caused confusion as only the following filters are supported at the moment:
 - `driver`
 - `type`
 - `name`
 - `id`
 - `label`

This fix update the help output of `docker network ls --filter` and `network_ls.md`.
The `dangling=true` description has been replace to:
```
Options:
  -f, --filter filter   Provide filter values (i.e. 'driver=bridge')
  ...
```

This fix fixes 28786.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 405fe721cc
Component: cli
2017-06-02 00:10:41 +00:00
4a1fdf9cf7 Add options for docker plugin enable and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: eff40eda38
Component: cli
2017-06-02 00:10:40 +00:00