Commit Graph

787 Commits

Author SHA1 Message Date
yuexiao-wang 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
Qinglan Peng 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
Kei Ohmura 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
Kei Ohmura 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
Jake Sanders 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
lixiaobing10051267 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
Chris Gavin 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
Yong Tang 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
Yong Tang 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
yuexiao-wang 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
Vincent Demeester 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
Akihiro Suda 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
John Howard 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
Yanqiang Miao 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
yuexiao-wang 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
Misty Stanley-Jones 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
Misty Stanley-Jones 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
Misty Stanley-Jones 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
yuexiao-wang 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
Vincent Demeester 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
Harald Albers 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
Kei Ohmura 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
Kei Ohmura 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
Yanqiang Miao 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
Victor Vieux 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
Daniel Nephin 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
Daniel Nephin 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
Yanqiang Miao 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
Yong Tang 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
yuexiao-wang 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
dattatrayakumbhar04 430522a380 28600: Docs: network connect for container in Created/Stopped state
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
Upstream-commit: 1f2128a8c5
Component: cli
2017-06-02 00:10:40 +00:00
John Howard 0788178552 Fixes typo 'bin-mounts'
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 22478663c2
Component: cli
2017-06-02 00:10:40 +00:00
erxian b37d8d1de7 update secret command
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: afe0b2988c
Component: cli
2017-06-02 00:10:40 +00:00
Vincent Demeester ca2113e23f Update docker info cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0202ece8e1
Component: cli
2017-06-02 00:10:40 +00:00
Vincent Demeester 3c062149b3 Update plugin enable cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7792b0d382
Component: cli
2017-06-02 00:10:40 +00:00
Harald Albers 3d9b37f417 Move docker stack docs out of experimental
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d16010d737
Component: cli
2017-06-02 00:10:40 +00:00
cyli 9ebeff0e6c Update docs to reflect no longer displaying secret digest or size.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 50674ba5f6
Component: cli
2017-06-02 00:10:40 +00:00
Jacob Tomlinson 8fdb1bb909 Add concurrent uploads/downloads section
Document and link to the concurrent uploads/downloads daemon option.

Signed-off-by: Jacob Tomlinson <jacob@tom.linson.uk>
Upstream-commit: ddf22952a0
Component: cli
2017-06-02 00:10:40 +00:00
Ben Firshman 74de856edc Rename Remote API to Engine API
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 2cfcc8a8fa
Component: cli
2017-06-02 00:10:40 +00:00
Harald Albers 71bca31df5 Fix typo in docs (Copmose)
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6b8588ab94
Component: cli
2017-06-02 00:10:40 +00:00
Vincent Demeester db80752229 Add documentation about templating support on…
… services creation/update.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 594b69d1ff
Component: cli
2017-06-02 00:10:40 +00:00
Sebastiaan van Stijn 2f98c46572 Update service ps reference for "--no-trunc"
The "--no-trunc" option toggles between showing/hiding
digests.

This updates the reference to show this difference.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3e4a6ba39b
Component: cli
2017-06-02 00:10:39 +00:00
Aaron Lehmann 03051a233c cli: Add valid suffixes for remaining duration options
A recent PR added `(ns|us|ms|s|m|h)` to the descriptions of some
duration options, but not all. Add it to the remaining options for
consistency.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 53ef5c34c0
Component: cli
2017-06-02 00:10:39 +00:00
Vincent Demeester 0d57e2c399 Update cli reference for docker {,stack} deploy
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 17398ca0c3
Component: cli
2017-06-02 00:10:39 +00:00
bbayani 6464ebb77a Clarify that ipmasq rules are not added when iptables is false
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: d6d3f5144c
Component: cli
2017-06-02 00:10:39 +00:00
Boaz Shuster 7456ec0c6e Change the docker-tag usage text to be clearer
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: c4776804f4
Component: cli
2017-06-02 00:10:39 +00:00
Vincent Demeester ff493cde21 Update images cli reference with reference filter
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f28c79766c
Component: cli
2017-06-02 00:10:39 +00:00
Vincent Demeester ee6097675a Update stats cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d22558eb16
Component: cli
2017-06-02 00:10:39 +00:00
Yong Tang 481c891999 Update docs for docker info for most recent changes.
This fix updates docs for `docker info` for most recent changes.
It also made several chagnes:
1. Replace 0.12.0-dev to 0.13.0 for api docs v1.24.
2. Replace 0.13.0-dev to 0.13.0 for api docs v1.25

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 241694402f
Component: cli
2017-06-02 00:10:39 +00:00
Sebastiaan van Stijn 29bd09e6d2 Revert reference docs for ambient capabilities
This feature was reverted for docker 1.13
in c5251f7116e3d9095a7169fc31bd170dff997c2e,
so removing the documentation as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f2573a87ed
Component: cli
2017-06-02 00:10:39 +00:00