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
f53ec9c3d1
Windows: Builder case insensitive env
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 49f392ff6b528d571eac538f5365bd51c4c83e5c
Component: engine
2016-11-28 10:30:45 -08:00
2345e8bf51
updating notary to released 0.5.0 version
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
Upstream-commit: 175792a65563b6ee14d049631d46749cd4165a3c
Component: engine
2016-11-28 10:29:17 -08:00
ae5687c23e
Merge pull request #28514 from Microsoft/jjh/workdir
...
Refix COPY file . after WORKDIR (now always created)
Upstream-commit: 937027a0cbaf256ca32664d8d64d1c8eda16eaa6
Component: engine
2016-11-28 12:58:17 -05: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
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
283a98479d
Merge pull request #28625 from albers/completion-plugins
...
Add bash completion for plugin API
Upstream-commit: 783d4ac6d40b48f40e752561c79e777b35c2c0a9
Component: engine
2016-11-28 08:56:53 -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
9504c186db
Merge pull request #28877 from vdemeester/dont-export-accepted-filter
...
AcceptedFilters in router/network/filter.go should not be exported
Upstream-commit: 56a979801a9405aaa19199687b3cacae46f10af3
Component: engine
2016-11-28 17:40:15 +01:00
37ea301199
stack deploy: handle external network when deploying
...
If the network is marked as external, don't use the namespace on
it. Otherwise, it's not found.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6fff8454099092780655e8a2c7d71402ce547c5c
Component: engine
2016-11-28 17:38:41 +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
50f0cb2e24
AcceptedFilters in router/network/filter.go should not be exported
...
It's not used elsewhere and doesn't need to be exported.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e517d7975eb7e4dec8326b181e5fcc81b7871575
Component: engine
2016-11-28 14:14:50 +01:00
796e3c3730
Stop returns 0 when docker service was not running
...
In case when docker was not running init script stop was returning value <> 0.
Due to this fact it was impossible to uninstall the docker-engine if the docker service was stopped.
Signed-off-by: Cyprian Gracz <cyprian.gracz@micro-jumbo.eu >
Fixed message logging
Signed-off-by: Cyprian Gracz <cyprian.gracz@micro-jumbo.eu >
Upstream-commit: 74cf6157ef0d8788a56aed65a85b722ccb50e398
Component: engine
2016-11-28 12:27:21 +01:00
b852c07238
Make swagger.yaml operationIds consistent
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: bf6a790f00ab96bb8857e3c73502909ee5e36217
Component: engine
2016-11-28 11:24:26 +00:00
5d08ec3b42
Make docs URLs in swagger.yaml absolute
...
This makes the swagger.yaml useful outside of the documentation.
For background:
https://github.com/docker/docker.github.io/pull/606#issuecomment-261389645
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 54051b18a1d65d67de4cb796350e8924936b6a20
Component: engine
2016-11-28 11:24:26 +00:00
b4894221ee
Improve tags in swagger.yaml
...
- Consistent naming (plural, etc)
- Add section descriptions
- Add docs in swagger.yaml about how to maintain them
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 2aea9ad56b7dc59858abe15b2ae9f60ede294b2f
Component: engine
2016-11-28 11:24:25 +00:00
a5180dfb63
Add intro to swagger.yaml to explain what it's for
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: be52738a2c5a327741da6be7eb95a93a4c214a99
Component: engine
2016-11-28 11:24:25 +00:00
d6a43b5d6a
Fix headings in old API docs
...
Jekyll automatically adds titles based on the title of the page,
so this was causing duplicate titles.
Also, made all the headings the correct level.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: d9b109b807a1ea859b9d71eb22663f577b0b8c47
Component: engine
2016-11-28 11:24:22 +00: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
8b597c0ef3
Add bash completion for docker service {create,update} host options
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f3b7f40aafb009a3779e94ec9b2a8de1e0ce96bc
Component: engine
2016-11-27 05:08:35 -08:00
ec37dc533e
Add zsh completion for 'docker stack' subcommand
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 1e0c612f848a3fa5bfbcf347e5f91512ae9c4773
Component: engine
2016-11-27 13:59:48 +01: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
a0f0d908cc
Add bash completion for plugin API
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ecb707cb0f0ebb50fb1b90f4ab3c4ae611925ed2
Component: engine
2016-11-26 11:04:55 -08:00
9b5ea3c1b2
Add bash completion for docker stack
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 16494a81f98632a67a9d10ee7892fe25a51d3de4
Component: engine
2016-11-26 10:45:07 -08: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
89a9795d2b
Merge pull request #28710 from miaoyq/eliminate-redundant-parameters
...
Eliminate the redundant parameter
Upstream-commit: 76a0dfaa8e77fc04d97357fcb999d669b6485db2
Component: engine
2016-11-26 14:37:17 +01: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
2f9e7efdc3
Merge pull request #28829 from lixiaobing10051267/masterDaemon
...
check typos and fix in daemon directory
Upstream-commit: 022c13271b274074a6190952f1888b01c13c4a7c
Component: engine
2016-11-26 14:33:09 +01:00
26510bfcf5
Merge pull request #28855 from YuPengZTE/devMD023
...
fix the typo
Upstream-commit: 2f5dbd63b097fe0c25d1fdbb57f094dca0f01701
Component: engine
2016-11-26 14:31:54 +01:00
a785653ea6
Add zsh completion for 'docker service update --hostname'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b23fbc3fbd133c9463c73a66e09f1dfbff902ffb
Component: engine
2016-11-26 14:13:00 +01:00
115737bff2
check typos and fix in daemon directory
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: cf4f5b47710b3875767f997fc2eb3386cb0b66c0
Component: engine
2016-11-26 17:23:21 +08:00
09fb4fd4cc
fix the mistake of present
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 6e1339bbc624711c992e27ebf368d53599c97a2d
Component: engine
2016-11-26 17:11:19 +08: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
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
0fab75c2a1
Fix grammar on error message
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: cd5c8e9c2dc181cd624bdb10947a19197215d730
Component: engine
2016-11-25 14:58:20 +00:00
abc0690712
Merge pull request #28833 from albers/completion-service-update--hostname
...
Add bash completion for `docker service update --hostname`
Upstream-commit: 28c3d5c2f94fcd2aec6ecfd8568034dbe1bc3709
Component: engine
2016-11-25 14:03:54 +01:00
26220a9b42
Merge pull request #28832 from runcom/seccomp-comment-fix
...
profiles/seccomp: fix comment
Upstream-commit: 58d59c63e0ab3968ed0dcc061548c0abc02bf27d
Component: engine
2016-11-25 21:31:29 +09:00
94240c87f9
Merge pull request #28759 from miaoyq/optimization-context-name1
...
Optimize the function 'Context.Name()' and replace 'Context.Container…
Upstream-commit: e026f80a4d217eda5622c2b984fde2cdb8da0dc3
Component: engine
2016-11-25 13:25:17 +01:00
66c7d1e16a
Add bash completion for docker service update --hostname
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9d98d6d8cb23a5078e2d81014620fdd390c32abf
Component: engine
2016-11-25 12:42:30 +01:00
124e769d99
profiles/seccomp: fix comment
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 197f3ee687d8f68f8b7876b622259cd803354b86
Component: engine
2016-11-25 11:40:54 +01: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
3e48f2a055
Merge pull request #28779 from Microsoft/jjh/tp5-runtests
...
Windows: Update TP5 refs in run_test.go
Upstream-commit: a24c750c7ccfdb2a952922f4029a76a10f811349
Component: engine
2016-11-25 10:27:22 +01:00
