Aaron Lehmann
b88197c265
cluster: Do not autodetect advertise address on join
...
On join, remote addresses are supposed to be detected by the manager
that receives the join request. However, the daemon is interfering with
this by automatically detecting an advertise address and specifying that
to the remote manager. Fix this so that an advertise address is only
specified while joining a cluster if one was given by the user.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: b1d2b088533187954d3b98ed5951ec2dbbb422e9
Component: engine
2016-08-31 11:44:32 -07:00
Michael Crosby
161e8a294e
Merge pull request #25616 from rhatdan/overlay_selinux
...
Linux upstream kernel Overlay file systems support SELinux
Upstream-commit: b42ab41b8f0c9077180686191c0dccda9fb1a5b6
Component: engine
2016-08-31 09:25:20 -07:00
Justin Cormack
c03a13f697
Merge pull request #26139 from yuexiao-wang/fix-link
...
Modify link for hub and registry
Upstream-commit: ad6f5a49d5f24f8b64def11176b6c8df162d839f
Component: engine
2016-08-31 16:37:50 +01:00
Vincent Demeester
5645fa8e4e
Merge pull request #26182 from yuexiao-wang/add-options
...
Miss the options in some commands
Upstream-commit: ba23bf202adab9f4b8c9dcaffeddfd130674fb15
Component: engine
2016-08-31 14:45:42 +02:00
Vincent Demeester
f9a92ea425
Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
...
make command "docker plugin inspect" complete
Upstream-commit: cf699ad427084076c7ca1ea5fbab78cd77597f2a
Component: engine
2016-08-31 14:42:03 +02:00
Vincent Demeester
a2a77498bf
Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate
...
provide actual command format for docker network create
Upstream-commit: 37fd1416daac0b3963dc812a820b844e9e854e59
Component: engine
2016-08-31 14:41:49 +02:00
Vincent Demeester
33fbdef4b0
Merge pull request #26187 from albers/docs-volume-create-fix
...
Fix argument order for docker create in tutorial
Upstream-commit: 670eaa71a0629323327cb5604c44abf14890d4b4
Component: engine
2016-08-31 14:41:22 +02:00
Vincent Demeester
4b86079014
Merge pull request #26185 from yuexiao-wang/update-docs
...
Update description for docker plugin inspect
Upstream-commit: 0414a2c1a960832cc6d3df8641f23952c3700084
Component: engine
2016-08-31 14:41:03 +02:00
lixiaobing10051267
d8db57f8be
make command "docker plugin inspect" complete
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: d022bb208461dd1ed9702d8528eed627bc364258
Component: engine
2016-08-31 19:59:23 +08:00
lixiaobing10051267
3dedb3cd52
provide actual command format for docker network create
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 18a9600fb15b057af9d3574210b92cb107eefb24
Component: engine
2016-08-31 17:40:13 +08:00
yuexiao-wang
8de2c11691
Update description for docker plugin inspect
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: fdedc38f0c398a81360a90b627493872ef3c8a56
Component: engine
2016-08-31 16:57:44 +08:00
Lei Jitang
91ff731c41
Merge pull request #26188 from albers/completion-volume-create-name
...
Remove bash completion for `docker volume create --name`
Upstream-commit: 4e7cbb91f8bde7ca07db7d338c73f7dc7cd9c536
Component: engine
2016-08-31 16:57:32 +08:00
Vincent Demeester
589e937fbd
Merge pull request #26122 from sfsmithcha/updates_for_new_plugin_docs
...
some fixes to clean up new plugin system docs
Upstream-commit: c1b82df74042a0290b995283c504b60ac6b4bc95
Component: engine
2016-08-31 10:43:02 +02:00
Harald Albers
6b40fbbd4d
Remove bash completion for docker volume create --name
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7f9096adb7f5aa3845e256323c7f2107c04d2ff2
Component: engine
2016-08-31 09:50:11 +02:00
Harald Albers
a779e2caf3
Fix argument order for docker create in tutorial
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 109334030cd970475b0ec313b0f8709a5cad1c42
Component: engine
2016-08-31 09:41:04 +02:00
yuexiao-wang
8af8bf399a
Miss the options in some commands
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b8af6b579b4f5f3799957165f0a1631b4b68faa4
Component: engine
2016-08-31 14:18:41 +08:00
Vincent Demeester
a1888f0dad
Merge pull request #26128 from q384566678/test-zhou
...
Modify restart function prompt
Upstream-commit: 198024bf370be7fa2c956250150dee33420a959d
Component: engine
2016-08-31 08:03:12 +02:00
Arnaud Porterie
46917ea009
Merge pull request #26183 from icecrime/misty_docs_maintainer
...
Add Misty to docs maintainers
Upstream-commit: 347f07891829a92e210519f8b65cc918d063cc3d
Component: engine
2016-08-31 04:31:52 +00:00
Arnaud Porterie
616e0ae5a7
Add Misty to docs maintainers
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: e584d91becdf34c7721f2e17c7c8f0fc15df5945
Component: engine
2016-08-30 20:25:20 -07:00
Tõnis Tiigi
033314a228
Merge pull request #26170 from Microsoft/jjh/testimages
...
Windows: Enable TestImage and TestImport tests
Upstream-commit: fbcf0a50b20e3ae10bc6a4d385b00b618683a24a
Component: engine
2016-08-30 17:52:50 -07:00
Tõnis Tiigi
b5b3cd120e
Merge pull request #26166 from Microsoft/jjh/testhelp
...
Windows: Enable TestHelpExitCodesHelpOutput
Upstream-commit: b26059a0ca06d9f15b81e3146f3fdf21bc9def3e
Component: engine
2016-08-30 17:50:52 -07:00
Tõnis Tiigi
9e4e7e8763
Merge pull request #26165 from Microsoft/jjh/testexec
...
Windows: Enable a couple of exec tests
Upstream-commit: 4d15f428b18283e62e39cb48e3560315a11511aa
Component: engine
2016-08-30 17:50:25 -07:00
Tõnis Tiigi
340d6d4267
Merge pull request #26164 from Microsoft/jjh/testcreate
...
Windows: Enable some create CI tests
Upstream-commit: 75dc3614f78dbbaf20f99153456fad86656f7b87
Component: engine
2016-08-30 17:49:57 -07:00
Tõnis Tiigi
dc05468dea
Merge pull request #26163 from Microsoft/jjh/testcp
...
Windows: Enable some cp integration tests
Upstream-commit: 5d5d80ca6931926aae2a77d9f6d56a616408e939
Component: engine
2016-08-30 17:49:26 -07:00
Tõnis Tiigi
301f93448b
Merge pull request #26161 from Microsoft/jjh/testcontainerapi
...
Windows: Port api_containers_test tests
Upstream-commit: 69f25f9da819ea01a59d7697133dd11aa8045a5d
Component: engine
2016-08-30 17:48:43 -07:00
Michael Crosby
1318d71626
Merge pull request #24116 from frapposelli/add-photon-rpm
...
Add RPM builder for VMware Photon OS
Upstream-commit: 9718d5377fa41b5ff50b62c031fb943ceb668c20
Component: engine
2016-08-30 17:08:56 -07:00
Fabio Rapposelli
cc7e4cafad
Add rpm builder for VMware Photon OS
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com >
Upstream-commit: 6c7e1863d552afe156eb430575cbc0e1057a77e1
Component: engine
2016-08-30 17:05:32 -07:00
Arnaud Porterie
23c1ddf73c
Merge pull request #26140 from yuexiao-wang/modify-usage
...
Modify options for the command plugin install
Upstream-commit: ec82819cc9c652908fd74fb2082900dfa0468bcc
Component: engine
2016-08-31 00:04:45 +00:00
Alexander Morozov
7d95254126
Merge pull request #26154 from yongtang/08302016-docker-cli-info-test-DockerDaemonSuite
...
Change related tests from DockerSuite to DockerDaemonSuite in `docker_cli_info_test.go`
Upstream-commit: 399761af4d508e5afe09d44bb350a1946cd719fb
Component: engine
2016-08-30 16:56:00 -07:00
Arnaud Porterie
b4cb86292e
Merge pull request #26162 from tonistiigi/print-stack-on-leave
...
Print stacktrace on failing to leave cluster
Upstream-commit: 67510c75e974f437e2a13c3b169371d7d56eaf40
Component: engine
2016-08-30 23:36:42 +00:00
Alexander Morozov
e09b4da22d
Merge pull request #26158 from mlaventure/reexport-exitcode
...
Reexport exitcode
Upstream-commit: 0fc393674c1fd345947e4dbfd6935fe045c9b650
Component: engine
2016-08-30 16:02:48 -07:00
Doug Davis
eedb832866
Merge pull request #26171 from CrimsonGlory/patch-2
...
typo
Upstream-commit: 6705d68c8995137f94e2f0958c72e1502e682c88
Component: engine
2016-08-30 18:52:13 -04:00
CrimsonGlory
af4e81149a
typo
...
Signed-off-by: Javier Bassi <javierbassi@gmail.com >
Upstream-commit: 682a8ecb8b77e35745c1720b9c9ee9a5fe885fa4
Component: engine
2016-08-30 19:46:07 -03:00
John Howard
fc4e2188e9
Windows: Enable TestImage and TestImport tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7ea707d5ef94f95dd0eaa10797e1b82157bfeb96
Component: engine
2016-08-30 15:20:55 -07:00
John Howard
76b23556e1
Windows: Enable TestHelpExitCodesHelpOutput
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f93f692e51f05481d9eb5163108d1eda36faf117
Component: engine
2016-08-30 15:05:02 -07:00
John Howard
7ff0928110
Windows: Enable a couple of exec tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ea42182722be246b2048497908862a31cf903118
Component: engine
2016-08-30 15:03:18 -07:00
John Howard
2c2936c670
Windows: Enable some create CI tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 78aede292b513d6586e2cd01cda03eb57bf50530
Component: engine
2016-08-30 14:38:19 -07:00
John Howard
ba11bf3dd5
Windows: Enable some cp integration tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 088c3eeea8ae6e46bf698d0c99c98b92bc894063
Component: engine
2016-08-30 14:32:10 -07:00
Tonis Tiigi
3034e8ce29
Print stacktrace on failing to leave cluster
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 166d24e464a746dfb3359ee18be90fbd8563515c
Component: engine
2016-08-30 14:17:32 -07:00
Kenfe-Mickael Laventure
d7713e33ac
Add integration test to check persistence of exitcode and error message
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 88bfa6ede8fd1536d8248cc56882bc4b826d090d
Component: engine
2016-08-30 14:17:09 -07:00
Kenfe-Mickael Laventure
ba213d0956
Re-export container state's ExitCode and Error fields
...
Those are needed in order to reload their value upon docker daemon
restart.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 2998945a54577e24a6414d576bc861e58fa87359
Component: engine
2016-08-30 14:17:09 -07:00
John Howard
027f36b73d
Windows: Port api_containers_test tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3d5aac305f447ad545192c002a5bcef59925240d
Component: engine
2016-08-30 14:15:33 -07:00
Charles Smith
458bf87add
some fixes to clean up new plugin system docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 1dee308281c48a1363fff2433d842fcaa971dce4
Component: engine
2016-08-30 13:52:13 -07:00
Vincent Demeester
db247f3de4
Merge pull request #26020 from tonistiigi/fix-eventsbefore-test
...
Fix flaky TestEventsContainerFilterBeforeCreate
Upstream-commit: 73614f9f1e606cd9282589d11481d01c21dfe3fe
Component: engine
2016-08-30 22:24:52 +02:00
Vincent Demeester
cf98ba1499
Merge pull request #26153 from Microsoft/jjh/testcommitcli
...
Windows: Enable some commit tests
Upstream-commit: cf3e834c9b0e7f48959c099dc983f3d1f6ccb18d
Component: engine
2016-08-30 22:17:20 +02:00
Vincent Demeester
58d79a8716
Merge pull request #26145 from allencloud/update-command-description
...
update command description
Upstream-commit: 19aee549269ab7e7a025aaf7b820577f52dc4443
Component: engine
2016-08-30 22:16:57 +02:00
Vincent Demeester
341c5e093f
Merge pull request #26147 from Microsoft/jjh/testbuildapi
...
Windows: Enable 5 Build API tests
Upstream-commit: 8a46c18dd4e4f8091b9e02ef5b476e8b8aa77c47
Component: engine
2016-08-30 22:12:36 +02:00
Vincent Demeester
b4e6ad86f8
Merge pull request #26149 from Microsoft/jjh/testbuildcli
...
Windows: Enable multiple cli build tests
Upstream-commit: 16148d04207c131b2fe01f35301d58d2609a1b54
Component: engine
2016-08-30 22:12:24 +02:00
John Howard
4d00b3694e
Merge pull request #26151 from Microsoft/jjh/testbuildhistory
...
Windows: Enable docker_cli_history_test.go tests
Upstream-commit: 783fe398dc5a60ab4b64c6a024f8190fd5b57327
Component: engine
2016-08-30 11:58:31 -07:00
Yong Tang
da325a829b
Change related tests from DockerSuite to DockerDaemonSuite in docker_cli_info_test.go
...
This fix changes related tests from DockerSuite to DockerDaemonSuite
in `docker_cli_info_test.go`. Previously that was done through `NewDaemon()`.
This fix is related to the comments in:
https://github.com/docker/docker/pull/26115#discussion_r76784977
https://github.com/docker/docker/pull/24533#issuecomment-243420042
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 0ce5ef279cee13e92d696ae871fe81de37cec253
Component: engine
2016-08-30 10:11:01 -07:00
Aaron Lehmann
Michael Crosby
Justin Cormack
Vincent Demeester
lixiaobing10051267
yuexiao-wang
Lei Jitang
Harald Albers
Arnaud Porterie
Tõnis Tiigi
Fabio Rapposelli
Alexander Morozov
Doug Davis
CrimsonGlory
John Howard
Kenfe-Mickael Laventure
Charles Smith
John Howard
Yong Tang