6be9adf324
check inconsistant command in docs/reference/commandline
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: efe39448f76de4b3eab4feb7235f4f135b987dae
Component: engine
2016-09-01 12:21:52 +08:00
be784b745a
Merge pull request #26186 from ywk253100/master
...
Fixes #25654 , a bug in implements of loading image
Upstream-commit: 7776a0ebd76d7d69fb8198554e30a51d94edf056
Component: engine
2016-08-31 22:07:01 -04:00
436151d741
Merge pull request #26211 from aaronlehmann/no-advertise-addr-detection-on-join
...
cluster: Do not autodetect advertise address on join
Upstream-commit: beba6ea311fdff128ac2f1de78138c5da71d0f23
Component: engine
2016-08-31 17:19:23 -07:00
d6cc83cde2
Merge pull request #26208 from talex5/fix-health-test
...
Fix exec form of HEALTHCHECK CMD
Upstream-commit: 5a56f29c64ab1a2bb4f70ba65f248cd8fcebc57f
Component: engine
2016-08-31 23:27:39 +00:00
17a1a5ab1b
Merge pull request #26214 from tonistiigi/revert-daemonsuite-fix
...
Revert "Change related tests from DockerSuite to DockerDaemonSuite in…
Upstream-commit: bdae52a23dd69be29f0d5b871ee791180329e458
Component: engine
2016-08-31 14:16:39 -07:00
5fcc71ddc8
Merge pull request #26206 from crosbymichael/py-xunit
...
Output docker-py test results in xunit format
Upstream-commit: 243d4dcc7e9ea3eb665301d5e3756afa4adb04f7
Component: engine
2016-08-31 21:48:47 +02:00
6366d986f8
Merge pull request #26191 from runcom/fix-unknownflag-exit-code
...
api: client: container: update: fix help text
Upstream-commit: 6ac30e57d0c3060478a04352b19e4188a8d0cc3e
Component: engine
2016-08-31 21:15:51 +02:00
9a5643d969
Merge pull request #26058 from anusha-ragunathan/add-pluginstore
...
Reorganize plugin package into sub packages.
Upstream-commit: e3bc989a9d14f2c47eab7874fad2865d0906b9ea
Component: engine
2016-08-31 11:58:34 -07:00
5b72529835
Revert "Change related tests from DockerSuite to DockerDaemonSuite in docker_cli_info_test.go"
...
This reverts commit 0ce5ef279cee13e92d696ae871fe81de37cec253.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f0e99972877f06904e0327e9537de8390b5cfb4b
Component: engine
2016-08-31 11:52:22 -07:00
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
22f7fc770f
Fix exec form of HEALTHCHECK CMD
...
We attached the JSON flag to the wrong AST node, causing Docker to treat
the exec form ["binary", "arg"] as if the shell form "binary arg" had
been used. This failed if "ls" was not present.
Added a test to detect this.
Fixes #26174
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com >
Upstream-commit: e95b6b51daed868094c7b66113381d5088e831b4
Component: engine
2016-08-31 17:50:12 +01:00
abf975f617
Output docker-py test results in xunit format
...
This adds a `results.xml` to the test-docker-py output folder.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: a9e513867cd9eb327ae56877886ed18a5ad5b691
Component: engine
2016-08-31 09:35:49 -07:00
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
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
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
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
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
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
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
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
7cfdadb657
api: client: container: update: fix help text
...
Before:
$ docker update --cpu-period
Status: flag needs an argument: --cpu-period
See 'docker update --help'., Code: 125
After:
$ docker update --cpu-period
flag needs an argument: --cpu-period
See 'docker update --help'.
Also remove flagErrorFunc function which isn't needed anymore.
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: c2c2617534685917c4a1c2367af861c598cc050a
Component: engine
2016-08-31 12:46:40 +02:00
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
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
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
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
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
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
c689c5c3a7
fixes #25654
...
Signed-off-by: Wenkai Yin <yinw@vmware.com >
Upstream-commit: 8f37abd056db2fdd1d1b23bdfbcbb907f1511fc3
Component: engine
2016-08-31 15:37:52 +08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e09b4da22d
Merge pull request #26158 from mlaventure/reexport-exitcode
...
Reexport exitcode
Upstream-commit: 0fc393674c1fd345947e4dbfd6935fe045c9b650
Component: engine
2016-08-30 16:02:48 -07:00
af4e81149a
typo
...
Signed-off-by: Javier Bassi <javierbassi@gmail.com >
Upstream-commit: 682a8ecb8b77e35745c1720b9c9ee9a5fe885fa4
Component: engine
2016-08-30 19:46:07 -03:00
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
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
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
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
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
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
