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
c5d7f73b75
Merge pull request #28928 from miaoyq/fix-some-format-err
...
Fix some format errors
Upstream-commit: 9387ccc68370b2c62d81691940cc9f7fffa2b28a
Component: engine
2016-11-29 16:02:35 +01:00
37d24c3652
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: 71f1205269494430116e7a564ee76bfa0bfccc63
Component: engine
2016-11-29 21:45:04 +08: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
ee131d47d1
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: d73f73b3654add36096def93f5736cc6a6686226
Component: engine
2016-11-28 23:44:24 +01: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
5d16bd52ab
Fix some redirect loops and problems
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: a1f55dca21c4ee9f38ed2aeba535cdba3bb2f790
Component: engine
2016-11-28 09:46:38 -08: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
4118c22bb4
Merge pull request #28657 from erxian/fix-doc-about-service-create
...
fix doc about service create in docker_remote_api_v1.24.md
Upstream-commit: 85a99c88913a104a5793294ed18e739f423d9dfa
Component: engine
2016-11-28 16:06:50 +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
1d2339b8c6
Merge pull request #28857 from miaoyq/fix-a-description-of-docker-run
...
Fix description and link of 'docker run [-a]'
Upstream-commit: d5dee554ea642a33f2f790f56e48d5041f65b216
Component: engine
2016-11-28 10:31:06 +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
3d75a15962
Merge pull request #28824 from lixiaobing10051267/masterPlugin2
...
modify invalid url in plugins_network.md
Upstream-commit: 9dc0c8ec328c02eca56556c0a2bde1503e6a9aca
Component: engine
2016-11-26 23:22:52 +01:00
636e8b8148
Fix a description of 'docker run [-a]'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 08ff4f427e5ab6b597348661e602cd2a335e0aa0
Component: engine
2016-11-26 22:56:29 +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
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
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
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
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
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
dc30d51d5a
modify invalid url in plugins_network.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fc7c235f84f76d5d64f25bc802486ecbe87f8b95
Component: engine
2016-11-25 15:40:51 +08:00
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
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
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
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
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
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
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
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
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
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
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
01461a6103
Update docker info cli reference documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d28eaa11710f2aa0429ccdc3dc7fd83c67f2775c
Component: engine
2016-11-23 17:20:12 +01:00
99086026bc
update secret command
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: d87c91e39ff0d3defb5b98fdc9275c8c0bfc987e
Component: engine
2016-11-23 10:07:09 -05:00
8205b9e733
Merge pull request #28758 from vdemeester/update-plugin-enable-cli-doc
...
Update plugin enable cli reference documentation
Upstream-commit: 55cd9c4edc9b6ed912170e71c1e65bf1d3a3bba2
Component: engine
2016-11-23 15:53:02 +01:00
8cb287199f
Update plugin enable cli reference documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 43297dd6f81d85d1ac3dc49d68684404be0f2d8e
Component: engine
2016-11-23 15:42:40 +01:00
090bb3fe14
Move docker stack docs out of experimental
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: bb96e18b19f78af38a9fe088b2873988ba9a47b4
Component: engine
2016-11-23 11:14:38 +01:00
c1c6b75097
update the secret command docs
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: c22821014a8d951d7028f9d2888072c4d9f7c593
Component: engine
2016-11-23 10:36:11 +08:00
e92b610690
Merge pull request #28727 from cyli/do-not-display-secret-digest
...
Do not display the digest or size of swarm secrets [1.13]
Upstream-commit: 22ba220e864d6d30ce1ed56a5461b96dbade844f
Component: engine
2016-11-22 16:44:06 -08:00
e746d79ff3
Merge pull request #28601 from tiborvass/plugin-misc-fixes
...
Plugin miscellaneous fixes
Upstream-commit: 23ea9e45fd6281e82c389e6112457a7bb70f8d89
Component: engine
2016-11-22 16:12:37 -08:00
00fa4cf151
Update docs to reflect no longer displaying secret digest or size.
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: fe127b7eae427bde96b7852ac196825e1c9ea359
Component: engine
2016-11-22 18:18:56 -05:00
8236c4e19a
plugins: misc fixes
...
Rename variable to reflect manifest -> config renaming
Populate Description fields when computing privileges.
Refactor/reuse code from daemon/oci_linux.go
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 6547609870b66f9dfb1894a4987c42608f856f3e
Component: engine
2016-11-22 14:32:07 -08:00