2f578bc37e
fix the man page and zsh completion for docker images
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: f3d9214d0b42788cfda5104e2a223e968e5a7e82
Component: engine
2016-09-02 09:52:10 +00:00
9d092e464e
Merge pull request #26241 from YuPengZTE/devNote
...
The first letter of “docker“ is small
Upstream-commit: b14f29dfbd527fd2dbd05e024f760939aba6642c
Component: engine
2016-09-01 20:53:07 +02:00
a7538f7929
Merge pull request #26242 from YuPengZTE/devEG
...
"eg." should be "e.g."
Upstream-commit: baf2108baf8f4ff504847224cfb00794dfea5c20
Component: engine
2016-09-01 20:46:46 +02:00
19ba10b1b0
Merge pull request #26172 from Microsoft/jjh/testinspect
...
Windows: Enable multiple TestInspect tests
Upstream-commit: a19bdec6f0f2ca1b7539f701583f2f33f1923a2c
Component: engine
2016-09-01 19:46:19 +02:00
a1893f6374
Merge pull request #26077 from runcom/fix-TestImportBadURL
...
integration-cli: fix TestImportBadURL w/o network
Upstream-commit: 83fc63f9678cd1233bb0f86591a558acada621ac
Component: engine
2016-09-01 09:30:02 -07:00
9c1528efb8
Merge pull request #26226 from YuPengZTE/devTest
...
The first letter should be small in errors.New
Upstream-commit: 8abaf62715fab8422f20a28af2ff848223898839
Component: engine
2016-09-01 17:28:32 +02:00
a03ebc79ee
Merge pull request #26200 from runcom/engine-api-vendor
...
vendor docker/engine-api@f9cef59044
Upstream-commit: 8ccac1ad4de898583113d036810da3a35a9be906
Component: engine
2016-09-01 10:51:34 +01:00
ec1fcdb2ef
eg. should be e.g.
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: e4ac375fdbf331a8474c3b9a33be21a6434d5eb6
Component: engine
2016-09-01 17:44:35 +08:00
4fbbab7cfa
The first letter docker is small
...
Upstream-commit: e0e62874bb9bcdaf6418e0d1728c9170527b3c3a
Component: engine
2016-09-01 17:03:01 +08:00
d73fb19f36
Merge pull request #26180 from yongtang/25943-validate-ip6
...
Fix issue in `--ip6` validation for `docker create`
Upstream-commit: f173555de8201d8b4a6578a52d405655212fbb5d
Component: engine
2016-09-01 11:02:16 +02:00
861fb5fa76
Merge pull request #26181 from yongtang/08302016-DockerDaemonSuite-NewDaemon
...
Change related test from DockerSuite to DockerDaemonSuite in `docker_cli_daemon_test.go`
Upstream-commit: b8d510e86ad6a70aad09442b89e0e984b14e0c72
Component: engine
2016-09-01 09:42:59 +02:00
c484c505e6
The first letter should be small in errors.New
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: e7935da2390bf458f07e9898f08a332ef9f53255
Component: engine
2016-09-01 11:26:40 +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
1965814a4e
vendor docker/engine-api@f9cef59044
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 8f7a8c75ae251f1260299892c5de7c83224b110e
Component: engine
2016-08-31 22:39:13 +02: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
6f341d34b6
Windows: Enable multiple TestInspect tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3ae6cd453ece9761a951efd839cf917078b03718
Component: engine
2016-08-31 08:12:50 -07: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
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
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
54575c4167
Fix issue in --ip6 validation for docker create
...
This fix tries to address the issue raised in comment:
https://github.com/docker/docker/pull/25943#discussion_r76843081
Previously, the validation for `ip6` is done by checking ParseIP().To16().
However, in case an IPv4 address or an IPv4-mapped Ipv6 address has been
provided, the validation will pass (should fail).
This fix first check if `--ip6` is passed with a valid IP address and returns
error for invalid IP addresses. It then check if an IPv4 or IPv4-mapped Ipv6
address is passed, and return error accordingly.
This fix adds two more cases in the tests. One for IPv4 address passed to `--ip6`
and another for Ipv4-mapped IPv6 address passed to `--ip6`. In both cases,
without this fix the validation will pass through.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 1e6eccae69bd9b1f65ec87c33a6a872c81f7fb23
Component: engine
2016-08-30 19:28:44 -07:00
ab000f181d
Change related test from DockerSuite to DockerDaemonSuite in docker_cli_daemon_test.go
...
This fix is a follow-up of 26154. I did a grep on `integration-cli` and
found out that there are several tests in `docker_cli_daemon_test.go`
that still use `NewDaemon` instread of `DockerDaemonSuite`.
This fix changes related tests from DockerSuite to DockerDaemonSuite in
`docker_cli_daemon_test.go`.
With this fix, now `NewDaemon` is only called from `SetUpTest` on
various DockerXXXSuite. That should help maintain the test code base.
This fix is related to the comments in:
26115
24533.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 5c0fd2d06e82ed56cec33702a68fbc77ac14cb6b
Component: engine
2016-08-30 18:30:27 -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
