Commit graph

26955 commits

Author SHA1 Message Date
Aaron Lehmann
b1d2b08853 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>
2016-08-31 11:44:32 -07:00
Michael Crosby
b42ab41b8f Merge pull request #25616 from rhatdan/overlay_selinux
Linux upstream kernel Overlay file systems support SELinux
2016-08-31 09:25:20 -07:00
Justin Cormack
ad6f5a49d5 Merge pull request #26139 from yuexiao-wang/fix-link
Modify link for hub and registry
2016-08-31 16:37:50 +01:00
Vincent Demeester
ba23bf202a Merge pull request #26182 from yuexiao-wang/add-options
Miss the options in some commands
2016-08-31 14:45:42 +02:00
Vincent Demeester
cf699ad427 Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
make command "docker plugin inspect" complete
2016-08-31 14:42:03 +02:00
Vincent Demeester
37fd1416da Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate
provide actual command format for docker network create
2016-08-31 14:41:49 +02:00
Vincent Demeester
670eaa71a0 Merge pull request #26187 from albers/docs-volume-create-fix
Fix argument order for docker create in tutorial
2016-08-31 14:41:22 +02:00
Vincent Demeester
0414a2c1a9 Merge pull request #26185 from yuexiao-wang/update-docs
Update description for docker plugin inspect
2016-08-31 14:41:03 +02:00
lixiaobing10051267
d022bb2084 make command "docker plugin inspect" complete
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-31 19:59:23 +08:00
lixiaobing10051267
18a9600fb1 provide actual command format for docker network create
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-31 17:40:13 +08:00
yuexiao-wang
fdedc38f0c Update description for docker plugin inspect
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-31 16:57:44 +08:00
Lei Jitang
4e7cbb91f8 Merge pull request #26188 from albers/completion-volume-create-name
Remove bash completion for `docker volume create --name`
2016-08-31 16:57:32 +08:00
Vincent Demeester
c1b82df740 Merge pull request #26122 from sfsmithcha/updates_for_new_plugin_docs
some fixes to clean up new plugin system docs
2016-08-31 10:43:02 +02:00
Harald Albers
7f9096adb7 Remove bash completion for docker volume create --name
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-31 09:50:11 +02:00
Harald Albers
109334030c Fix argument order for docker create in tutorial
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-31 09:41:04 +02:00
yuexiao-wang
b8af6b579b Miss the options in some commands
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-31 14:18:41 +08:00
Vincent Demeester
198024bf37 Merge pull request #26128 from q384566678/test-zhou
Modify restart function prompt
2016-08-31 08:03:12 +02:00
Arnaud Porterie
347f078918 Merge pull request #26183 from icecrime/misty_docs_maintainer
Add Misty to docs maintainers
2016-08-31 04:31:52 +00:00
Arnaud Porterie
e584d91bec Add Misty to docs maintainers
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-08-30 20:25:20 -07:00
Tõnis Tiigi
fbcf0a50b2 Merge pull request #26170 from Microsoft/jjh/testimages
Windows: Enable TestImage and TestImport tests
2016-08-30 17:52:50 -07:00
Tõnis Tiigi
b26059a0ca Merge pull request #26166 from Microsoft/jjh/testhelp
Windows: Enable TestHelpExitCodesHelpOutput
2016-08-30 17:50:52 -07:00
Tõnis Tiigi
4d15f428b1 Merge pull request #26165 from Microsoft/jjh/testexec
Windows: Enable a couple of exec tests
2016-08-30 17:50:25 -07:00
Tõnis Tiigi
75dc3614f7 Merge pull request #26164 from Microsoft/jjh/testcreate
Windows: Enable some create CI tests
2016-08-30 17:49:57 -07:00
Tõnis Tiigi
5d5d80ca69 Merge pull request #26163 from Microsoft/jjh/testcp
Windows: Enable some cp integration tests
2016-08-30 17:49:26 -07:00
Tõnis Tiigi
69f25f9da8 Merge pull request #26161 from Microsoft/jjh/testcontainerapi
Windows: Port api_containers_test tests
2016-08-30 17:48:43 -07:00
Michael Crosby
9718d5377f Merge pull request #24116 from frapposelli/add-photon-rpm
Add RPM builder for VMware Photon OS
2016-08-30 17:08:56 -07:00
Fabio Rapposelli
6c7e1863d5
Add rpm builder for VMware Photon OS
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2016-08-30 17:05:32 -07:00
Arnaud Porterie
ec82819cc9 Merge pull request #26140 from yuexiao-wang/modify-usage
Modify options for the command plugin install
2016-08-31 00:04:45 +00:00
Alexander Morozov
399761af4d 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`
2016-08-30 16:56:00 -07:00
Arnaud Porterie
67510c75e9 Merge pull request #26162 from tonistiigi/print-stack-on-leave
Print stacktrace on failing to leave cluster
2016-08-30 23:36:42 +00:00
Alexander Morozov
0fc393674c Merge pull request #26158 from mlaventure/reexport-exitcode
Reexport exitcode
2016-08-30 16:02:48 -07:00
Doug Davis
6705d68c89 Merge pull request #26171 from CrimsonGlory/patch-2
typo
2016-08-30 18:52:13 -04:00
CrimsonGlory
682a8ecb8b typo
Signed-off-by: Javier Bassi <javierbassi@gmail.com>
2016-08-30 19:46:07 -03:00
John Howard
7ea707d5ef Windows: Enable TestImage and TestImport tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-08-30 15:20:55 -07:00
John Howard
f93f692e51 Windows: Enable TestHelpExitCodesHelpOutput
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-08-30 15:05:02 -07:00
John Howard
ea42182722 Windows: Enable a couple of exec tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-08-30 15:03:18 -07:00
John Howard
78aede292b Windows: Enable some create CI tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-08-30 14:38:19 -07:00
John Howard
088c3eeea8 Windows: Enable some cp integration tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-08-30 14:32:10 -07:00
Tonis Tiigi
166d24e464 Print stacktrace on failing to leave cluster
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-30 14:17:32 -07:00
Kenfe-Mickael Laventure
88bfa6ede8 Add integration test to check persistence of exitcode and error message
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-08-30 14:17:09 -07:00
Kenfe-Mickael Laventure
2998945a54 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>
2016-08-30 14:17:09 -07:00
John Howard
3d5aac305f Windows: Port api_containers_test tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-08-30 14:15:33 -07:00
Charles Smith
1dee308281 some fixes to clean up new plugin system docs
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-30 13:52:13 -07:00
Vincent Demeester
73614f9f1e Merge pull request #26020 from tonistiigi/fix-eventsbefore-test
Fix flaky TestEventsContainerFilterBeforeCreate
2016-08-30 22:24:52 +02:00
Vincent Demeester
cf3e834c9b Merge pull request #26153 from Microsoft/jjh/testcommitcli
Windows: Enable some commit tests
2016-08-30 22:17:20 +02:00
Vincent Demeester
19aee54926 Merge pull request #26145 from allencloud/update-command-description
update command description
2016-08-30 22:16:57 +02:00
Vincent Demeester
8a46c18dd4 Merge pull request #26147 from Microsoft/jjh/testbuildapi
Windows: Enable 5 Build API tests
2016-08-30 22:12:36 +02:00
Vincent Demeester
16148d0420 Merge pull request #26149 from Microsoft/jjh/testbuildcli
Windows: Enable multiple cli build tests
2016-08-30 22:12:24 +02:00
John Howard
783fe398dc Merge pull request #26151 from Microsoft/jjh/testbuildhistory
Windows: Enable docker_cli_history_test.go tests
2016-08-30 11:58:31 -07:00
Yong Tang
0ce5ef279c 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>
2016-08-30 10:11:01 -07:00