3f00f70bbf
field NAMES ommitted after docker ps in commit.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: f34ccd70c8c55946fe9d3b83b44bdac770858176
Component: engine
2016-12-20 20:34:09 +08:00
55338a0e87
Merge pull request #29510 from albers/docs-remove-node-ps--all
...
Remove `--all|-a` from `docker node ps` reference
Upstream-commit: 309df6a59217852a8f1b14504ba064bbefb4727d
Component: engine
2016-12-19 09:31:43 +01:00
0fa3af8470
[docs,man] Fixed typo ( #29516 )
...
Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de >
Upstream-commit: e85bb788de950090c66e8501d294bd8b5e4e4723
Component: engine
2016-12-18 19:55:09 -05:00
46f764687c
Remove --all|-a from docker node ps reference
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 364e9002375fca1799180dd76e8074d922dd4044
Component: engine
2016-12-18 06:47:54 -08:00
2b846c8a06
Merge pull request #28629 from yongtang/28581-secret-create-input
...
Add `--file` flag for `docker secret create` command
Upstream-commit: 4436a5946d1cc20efb3af5a3d0c56894c02f1a29
Component: engine
2016-12-18 03:04:10 +01:00
9691034423
Merge pull request #29482 from thaJeztah/not-for-workers-only
...
swarm leave is not only for workers
Upstream-commit: 87e8828dffb29c351486e1e286c597cef238c5d1
Component: engine
2016-12-16 09:48:35 -08:00
588ffd020c
Merge pull request #29434 from yuexiao-wang/pause-and-unpause
...
Fix inconsistency for pause and unpause
Upstream-commit: ba76c9214dbbc5d6276a20136eb3c454a1aa0969
Component: engine
2016-12-16 16:42:04 +01:00
148f65373a
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: f89eee5d9d3c01bc6d498fcb1163ec199e6c3078
Component: engine
2016-12-16 15:10:20 +01:00
668e4bdf14
Add the whole related information for node
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b67b0949ed4b528fef6c3dc059a4bd16d5f2a929
Component: engine
2016-12-16 22:21:52 +08:00
b689c13fe1
Fix inconsistency for pause and unpause
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 082f4919cac55f32674874d96d82a310f6b1522d
Component: engine
2016-12-16 17:27:28 +08:00
fd62091f94
Merge pull request #29383 from yuexiao-wang/add-logs-link
...
Add the link for service logs
Upstream-commit: e9a69316b8245413eec9ac4fb8b2267883855b74
Component: engine
2016-12-15 13:23:18 +01:00
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
15f4ce0b26
Merge pull request #29419 from trapier/reference_service_create_typo
...
fix typo in reference for service create
Upstream-commit: 31eea90f523e6033951176719594b7a477a17e74
Component: engine
2016-12-15 09:45:17 +01:00
91cbeaba53
fix typo in reference for service create
...
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com >
Upstream-commit: 90c680ad259057d0065662a1a6fdad779bde6082
Component: engine
2016-12-14 14:56:55 -05:00
e1cfecec53
Add docs for docker network create --attachable
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7433d3acf61142bb1abbf7928ff0e20acf3eda56
Component: engine
2016-12-14 08:39:10 -08:00
c3c5d1b1fc
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: c6f0b7f448fac4d037d00f944a7908c60c04dff2
Component: engine
2016-12-13 07:35:45 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
