p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,747 Commits 2 Branches 295 Tags
3baf7d2e7500a4e553e5148d5b2ec7f96f7b3841
Commit Graph

1008 Commits

Author SHA1 Message Date
yuexiao-wang
3baf7d2e75 Add the link for service logs 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 54d38fe115e0183af7d862e54ba6e58c347e2a8d
Component: engine
 2016-12-15 17:43:51 +08:00
Sebastiaan van Stijn
30be95cf13 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: 5902fa33840507706e6e9b189fec0adeb20affa5
Component: engine
 2016-12-13 13:30:58 +01:00
lixiaobing10051267
1bef3cf8f2 stack_config.md not exist and delete it 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: afaff51a8b59630f880493679906acc3acc3005a
Component: engine
 2016-12-13 18:06:18 +08:00
Vincent Demeester
90bc3ba4b5 Merge pull request #29267 from yuexiao-wang/fix-bulid-para 
Update the option for docker build
Upstream-commit: 3d52c86d4c8405372445502b2592e8f63132ce99
Component: engine
 2016-12-13 08:55:20 +01:00
yuexiao-wang
d619a55e45 Update the option 'network' for docker build 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: cd317282c9b7d4dc68dce8df1d2f84e7a5654e72
Component: engine
 2016-12-13 18:18:53 +08:00
Kei Ohmura
ea1061f290 docs: fix description of docker swarm update --help 
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: 2f0e00f58723cb3e063b49f564173b3768476c99
Component: engine
 2016-12-11 21:25:40 +09:00
Kei Ohmura
aebf5fe759 docs: fix description of docker swarm join --help 
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: 77dd8474a7b4447d7c5b1d257afe1bb2f6443172
Component: engine
 2016-12-11 21:21:48 +09:00
Sebastiaan van Stijn
dfc806e15a Merge pull request #29092 from KingEmet/master 
Add credential helper documentation
Upstream-commit: 4bc3b4d6aa9f41460bc02f4245ba94e0041ed141
Component: engine
 2016-12-08 15:29:35 +01:00
lixiaobing10051267
c7b83e6391 add SCOPE field content for docker network ls 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 170fcead7ecd0dbe323d727a2afd3e2694e6af29
Component: engine
 2016-12-08 17:13:38 +08:00
Jake Sanders
405972988b Add credential helper documentation 
Signed-off-by: Jake Sanders <jsand@google.com>
Upstream-commit: 68211f4cb45baca957fef625ba3bb0c422dd20ec
Component: engine
 2016-12-07 10:14:28 -08:00
Chris Gavin
9c58790379 Fix a spelling mistake in the docs. 
Signed-off-by: Chris Gavin <chris@chrisgavin.me>
Upstream-commit: 35c82f422d5db64baec6739490900f7f8fa7d7fd
Component: engine
 2016-12-04 12:55:00 +00:00
Yong Tang
eaac95defc 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: 8a226ed6432a0614b25298fef872c98794f65ba9
Component: engine
 2016-12-02 13:42:50 -08:00
Yong Tang
2ac57c6dcf 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: 0ce6e070f7d1e4b1b478d52b4464f8480dbfd9b7
Component: engine
 2016-12-01 10:44:17 -08:00
Sebastiaan van Stijn
77750af0f0 Merge pull request #28922 from yuexiao-wang/fix-secret 
Fix the inconsistency for secret ls and secrect rm
Upstream-commit: a3be176f139e8fd54b985c5876eb677250890805
Component: engine
 2016-12-01 11:29:58 +01:00
Alexander Morozov
cefbd9b7e9 Merge pull request #28885 from vdemeester/revert-service-ps-all 
Revert "Add -a option to service/node ps"
Upstream-commit: 53d69aeb74962709464e0888f4a5c755be2c8e4d
Component: engine
 2016-11-30 12:02:34 -08:00
Alexander Morozov
a66f1eed5f Merge pull request #28838 from AkihiroSuda/remove-run-mount 
[Revert #26825] cli: remove `--mount` from `docker run`
Upstream-commit: caaa52c124539acb396c0b711ab95bc7ed459540
Component: engine
 2016-11-30 11:56:42 -08:00
yuexiao-wang
7fb4d2bab8 Fix the inconsistency for docker secret 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b4306588e982481c46708c535d5bfc5efdbd4cd8
Component: engine
 2016-11-30 17:23:39 +08:00
Sebastiaan van Stijn
8d868f3fc6 Merge pull request #28778 from Microsoft/jjh/volumenote 
Windows: Note about volumes in run
Upstream-commit: 7debf456e3320f4c84c3f2b2f2a1b914ad77aa40
Component: engine
 2016-11-29 17:40:54 +01:00
Sebastiaan van Stijn
b0adf0fb04 Merge pull request #28819 from yuexiao-wang/modify-link 
Modify the link about config.json for docker plugin create
Upstream-commit: f06c2f230a6d849ff173f5f943ad77a9bdcacb38
Component: engine
 2016-11-29 14:28:32 +01:00
Misty Stanley-Jones
d5ad036021 Document publishing a UDP port 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 2178c840ba420d7d207aedae292e2e70d7198265
Component: engine
 2016-11-28 15:41:56 -08:00
John Howard
b1f04046d7 Windows: Note about volumes in run 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b9e65f40cfce3eb1907ad9d8a358c6ae1ad64175
Component: engine
 2016-11-28 11:06:01 -08:00
Sebastiaan van Stijn
f17239930f Merge pull request #28891 from mstanleyjones/fix_doubled_words 
Fix instances of doubled words
Upstream-commit: 0e0a5e0d391c0d231cebcdfac619df39f0e52e04
Component: engine
 2016-11-28 19:57:17 +01:00
Misty Stanley-Jones
66e7509ec9 Fix instances of doubled words 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 379e9259cf407f6f97ba31f1ddb921256613cee3
Component: engine
 2016-11-28 10:48:45 -08:00
Misty Stanley-Jones
3a792f1aec Fix copypaste error 'is-automated' 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 2333657e1b20d6a482627b78c9333cdf34397ff5
Component: engine
 2016-11-28 10:31:38 -08:00
Vincent Demeester
871ee3d12b Revert "Add -a option to service/node ps" 
This reverts commit 139fff2bf0ebe12b61871ba8ec8be8d51c2338db.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: eb55d03f3c321e31c8da993233b2679f47d5b4e1
Component: engine
 2016-11-28 18:08:45 +01:00
Vincent Demeester
526d1ca139 Merge pull request #28822 from yuexiao-wang/modify-plugin 
Modify repoName to PLUGIN for docker plugin create
Upstream-commit: b20bf510e5ba26320c7f8ff827040b948a9225cd
Component: engine
 2016-11-28 17:52:04 +01:00
Antonio Murdaca
87758bef94 Merge pull request #28882 from vdemeester/remove-stack_config-doc 
Remove docker stack config commandline reference doc
Upstream-commit: 76459076c206165cc51eff4efb7077d2e555c026
Component: engine
 2016-11-28 15:34:29 +01:00
Sebastiaan van Stijn
133f4e5f14 Merge pull request #28865 from albers/docs-stack-ls-aliases 
Add aliases and options to `docker stack ls` docs
Upstream-commit: c04cf54d4eb96adb7a8b32dd2d9259f8a37f4025
Component: engine
 2016-11-28 15:27:35 +01:00
Vincent Demeester
259c9695f0 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: 3f98871a19eafbfa8ec7da3640d7006d0ca458ef
Component: engine
 2016-11-28 15:25:52 +01:00
Kei Ohmura
d1712bf1e7 fix more according to the actual output of 'docker swarm init --help' 
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: 4a3207de5b96a875b97e02dde83c75b1beabf184
Component: engine
 2016-11-28 18:40:11 +09:00
Kei Ohmura
541c855701 fix description of 'docker swarm init' 
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: 3abee1bf8aad5e24df635d70bceb39c69a1c2407
Component: engine
 2016-11-28 13:24:02 +09:00
Harald Albers
af53994c26 Add aliases and options to docker stack ls docs 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8260366dd2fae9ef15a8da52451757ef32e88aca
Component: engine
 2016-11-27 04:38:49 -08:00
Antonio Murdaca
7ac8174c1e Merge pull request #28780 from vieux/accept_src_in_secret 
support src in --secret
Upstream-commit: ce0068ed0483bd87dc4af1e7388d9b9a91431424
Component: engine
 2016-11-26 14:34:30 +01:00
Akihiro Suda
8f7e98f07f 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: e6d9b7de649c0b3b59c7d9b698af1c58f6dce289
Component: engine
 2016-11-26 04:55:28 +00:00
Vincent Demeester
3c733b5599 Merge pull request #28815 from dnephin/add-short-option 
Add a short flag for docker stack deploy
Upstream-commit: c36c63b308acbacefcd088f7bc0b0b68c79d9334
Component: engine
 2016-11-25 21:18:09 +01:00
Daniel Nephin
ac43a15799 Add a short flag for docker stack deploy 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f1dd721b6978f1c24bb2761b88c83d9e385bd781
Component: engine
 2016-11-25 13:23:36 -05:00
yuexiao-wang
a2f0c8aa51 Modify reponame to PLUGIN and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: c394034f5978862b75770a036364f806bbcd8920
Component: engine
 2016-11-25 23:09:46 +08:00
yuexiao-wang
8013774cb8 Modify the link for config.json 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4e970c1e5a2b16f9408f530037e65595810cc5d7
Component: engine
 2016-11-25 18:33:04 +08:00
Vincent Demeester
2775e09b52 Merge pull request #28771 from dnephin/add-missing-service-hostname-update 
Allow hostname to be updated on service
Upstream-commit: 3e58117608a2a7d5275c792d6d88e66c45e99655
Component: engine
 2016-11-25 10:26:06 +01:00
Yanqiang Miao
d22974936d Fix some syntax error 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 18724726c24728c0dd2bdb4981254a100568185f
Component: engine
 2016-11-25 10:03:28 +08:00
Daniel Nephin
3ecec6e350 Allow hostname to be updated on service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1c65cb6657f1288d6a7e93e0015bba68e6d374cd
Component: engine
 2016-11-24 15:44:35 -05:00
Yong Tang
6bc43aa829 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: 2510f254eea58788c1a98987db35294beb839bb4
Component: engine
 2016-11-24 08:14:36 -08:00
Vincent Demeester
0026f3bb52 Merge pull request #28802 from yuexiao-wang/fix-cli-typo 
Add options for docker plugin enable and fix some typos
Upstream-commit: 7aae360c413162d0886170a096b80a9a9e937c9e
Component: engine
 2016-11-24 17:03:56 +01:00
yuexiao-wang
7de409be5f Add options for docker plugin enable and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 9e414bfa6b26bf919fc7ffbf0cf87814043b328b
Component: engine
 2016-11-25 04:07:06 +08:00
Sebastiaan van Stijn
92d40c923d Merge pull request #28602 from dattatrayakumbhar04/nw-connect-paused-container-doc 
28600: Docs: network connect for container in Created/Stopped state
Upstream-commit: b3687bdcdc9e52a1cc154648262c69939d8633df
Component: engine
 2016-11-24 15:04:53 +01:00
Victor Vieux
c17df6c51f support src in --secret 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: f70470b71e519012e91137a2512f40d5bb8d18af
Component: engine
 2016-11-23 14:30:57 -08:00
John Howard
6e9dda554f Fixes typo 'bin-mounts' 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c8c1dfbaf3d4548bbf094c31ccaaf6858b33e6e0
Component: engine
 2016-11-23 14:01:57 -08:00
Victor Vieux
f55bac29b6 Merge pull request #28760 from ehazlett/carry-28576 
Update Secret Command help (carry #28576)
Upstream-commit: ae64cae74e387f77b5d5a7b13d1abf0e084112b4
Component: engine
 2016-11-23 12:29:55 -08:00
dattatrayakumbhar04
57d2ffce2e 28600: Docs: network connect for container in Created/Stopped state 
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
Upstream-commit: 16c9cdad6fd7c78600e795cad03ec8b34cba0371
Component: engine
 2016-11-23 20:20:37 +00:00
Vincent Demeester
f0d4bb09e7 Merge pull request #28765 from vdemeester/update-docker-info-docs 
Update docker info cli reference documentation
Upstream-commit: 2c978bd9460a16fa04c219f729d6dabb6e43ebab
Component: engine
 2016-11-23 17:27:08 +01:00