ce99f23b28
Merge pull request #28919 from allencloud/change-secret-remove-in-cli
...
change secret remove logic in cli
Upstream-commit: 063d5679c5662c260cd7d53efc10da0a835366e0
Component: engine
2016-11-29 15:08:24 +01:00
8b9cbd5ed5
Merge pull request #28893 from anusha-ragunathan/delete_onerr
...
On plugin pull errors, delete created dirs.
Upstream-commit: c1b0f23de0953e3d36cdd3b510cf6da4ebea6f76
Component: engine
2016-11-29 14:48:27 +01:00
89bc275c16
Merge pull request #28874 from yuexiao-wang/fix-layer-typo
...
Fix some typos
Upstream-commit: 986740691fa38143d8a6ec9d65846feae6221076
Component: engine
2016-11-29 14:45:08 +01:00
bdb282b28d
Fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: c8c7a3ff2112a1b17a06fc02633ed7b49a8aebf3
Component: engine
2016-11-30 03:01:32 +08:00
8074d9c4a5
Merge pull request #28904 from dnephin/add-volume-labels-to-deploy
...
Use namespace label on stack volumes
Upstream-commit: d5654a8e76e9dea770751d02ecfad4123cf724f4
Component: engine
2016-11-29 14:39:26 +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
ad81663166
change secret remove logic in cli
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5b93e77138f19d30245a3e0f9f8f834aa67458ec
Component: engine
2016-11-29 15:12:05 +08:00
b455703924
Merge pull request #28909 from Microsoft/jjh/moreworkdir2
...
WORKDIR set cmd
Upstream-commit: 1ef10c83c76281b55b6e790149555d4f5950409c
Component: engine
2016-11-28 20:35:21 -05:00
fbf2916db8
On plugin pull errors, delete created dirs.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 9e4234261c3e4d13f98218a97d7cc6644723e310
Component: engine
2016-11-28 16:57:27 -08:00
1657094e13
Merge pull request #28906 from mstanleyjones/udp_port_publishing
...
Document publishing a UDP port
Upstream-commit: 66154d08882339f7be244da963b2adaae49ed556
Component: engine
2016-11-29 00:57:41 +01:00
aeaa16bae6
Merge pull request #28898 from vdemeester/fix-imagelist-retrocompat
...
Fixes ImageList to be retro-compatible with older API
Upstream-commit: 0b04f1dca23c9996ad240361ce0f59f1a96f78c6
Component: engine
2016-11-28 18:57:13 -05:00
4c2dcd5ab3
WORKDIR set cmd
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1b97bb416b8e2d4cd77544a1d714026b25d73c2f
Component: engine
2016-11-28 15:44:10 -08: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
f10f66cfd3
Merge pull request #28897 from anusha-ragunathan/plugin_exit
...
Fix issue with plugin exit.
Upstream-commit: 584d23d8494ed07e5eb9684297eefc065ae7fedd
Component: engine
2016-11-28 15:25:27 -08:00
2ae9ad9ad5
Use namespace label on stack volumes.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4013a7c6d897051bb79982230f31279ee0c9a026
Component: engine
2016-11-28 18:02:39 -05: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
312027d8f9
Merge pull request #28776 from Microsoft/jjh/fix28775
...
Align output of docker version again
Upstream-commit: 8c2e674551fdcf7f8bd7514853e69e7363b28f56
Component: engine
2016-11-28 17:02:17 -05:00
f4c6d41e59
Fixes ImageList to be retro-compatible with older API
...
Make sure current client code can talk for ImageList can still talk to
older daemon.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c6e31454ba2f053bc6831651663cf538d142afaa
Component: engine
2016-11-28 22:15:50 +01:00
c7fce8b04c
Fix issue with plugin exit.
...
A plugin has an `ExitChan` channel which is used to signal the exit of
the plugin process. In a recent change, the initialization was
incorrectly moved to the daemon Shutdown path.
Fix this by initializing the channel during plugin enable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 890a98ceed982454515f5b089d9772fc1e4eb6e0
Component: engine
2016-11-28 12:48:56 -08:00
b27f0b5dc5
Merge pull request #28734 from ipbabble/master
...
Added and example of using --format with docker images
Upstream-commit: 60e72ea379ba0b8308f7bdec19ddfc8649402116
Component: engine
2016-11-28 20:57:13 +01:00
52fcb6e953
Align output of docker version again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: dfeaf7a959cf619f5460c88e7bc1fe5ce40d50a7
Component: engine
2016-11-28 11:38:58 -08:00
9bddcd96ba
Merge pull request #28792 from yuexiao-wang/restart-mgr
...
Optimize the unit test for restartmanager
Upstream-commit: 3ccc4bc370cf48eeb89d5de74b3b175da8785700
Component: engine
2016-11-28 20:27:44 +01: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
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
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
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
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
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
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
