Commit Graph

15 Commits

Author SHA1 Message Date
f36b50a0ec docs validation fixes
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 0cddc783cff152a383a109f70a9f7bc943dbb5ba
Component: engine
2016-06-03 21:43:45 +00:00
5578aba972 Merge pull request #23193 from allencloud/fix-typos
use grep to find all a/an typos
Upstream-commit: 98c245c9e63793cf8ca03c5500e0820447c1861c
Component: engine
2016-06-02 18:45:08 -07:00
35c5774373 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c1be45fa38e82054dcad606d71446a662524f2d5
Component: engine
2016-06-02 17:17:22 +08:00
807d499c54 Add documentation for running multiple daemons
Signed-off-by: Lukasz Zajaczkowski <lukasz.zajaczkowski@ts.fujitsu.com>
Upstream-commit: 3152a706c9b662eb30fd571d42a70f92584a0542
Component: engine
2016-06-01 08:38:53 +02:00
815da186d3 Fix error in dockerd.md for incorrect cluster-store-opts example.
This fix fixes an error in documentation (dockerd.md). In the
example given by dockerd.md, the option `cluster-store-opts`
is assigned with an array but this option can only be assigned
as a map.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 32b234885e798650cdff70f0459175e79a294b4d
Component: engine
2016-05-26 20:04:48 -07:00
d77d575d98 Merge pull request #22888 from ibuildthecloud/host-compat
Remove DOCKER_HTTP_HOST_COMPAT env var
Upstream-commit: ef89891855e132d3d0e4c92fa041f590c8e8198c
Component: engine
2016-05-26 14:41:22 -07:00
eaeb1bdc9d Merge pull request #22756 from wangxing1517/fix_docs_dockerd.md
Fix incorrectly named "ip-mask" and "api-cors-headers" options
Upstream-commit: f0d6fd93a2b2cbe4ad177524ca52018dae2fcce7
Component: engine
2016-05-24 18:21:52 +02:00
af7458f4ff Merge pull request #22774 from Microsoft/jjh/client
Windows: Daemon default to Hyper-V containers on client
Upstream-commit: 9f1a1212593e8e9ca4fcdeeaabc09e0deee8e806
Component: engine
2016-05-23 11:29:50 -07:00
d17ab45ce6 Remove DOCKER_HTTP_HOST_COMPAT env var
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 989f6f852f639404f8e86e179ce5389e2d29c5d2
Component: engine
2016-05-21 21:32:00 -07:00
8a34f4db20 Windows: Default to Hyper-V Containers on client
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ef2db56bcf73b3962548a474bbd4469d26f2c655
Component: engine
2016-05-21 11:29:53 -07:00
6b7262967f Ignore invalid host header between go1.6 and old docker clients
BenchmarkWithHack-4	   50000	     37082 ns/op	  44.50
MB/s	    1920 B/op	      30 allocs/op
BenchmarkNoHack-4  	   50000	     30829 ns/op	  53.52
MB/s	       0 B/op	       0 allocs/op

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 3d6f5984f52802fe2f4af0dd2296c9e2e4a1e003
Component: engine
2016-05-19 21:07:45 +02:00
083263af50 Fix some mistakes in dockerd.md
Signed-off-by: Wang Xing <hzwangxing@corp.netease.com>
Upstream-commit: f53902aa776d2aa795e7eb217478abdf98e22ddf
Component: engine
2016-05-19 20:41:37 +08:00
be88ed49c5 Docker pull/push with max concurrency limits.
This fix tries to address issues raised in #20936 and #22443
where `docker pull` or `docker push` fails because of the
concurrent connection failing.
Currently, the number of maximum concurrent connections is
controlled by `maxDownloadConcurrency` and `maxUploadConcurrency`
which are hardcoded to 3 and 5 respectively. Therefore, in
situations where network connections don't support multiple
downloads/uploads, failures may encounter for `docker push`
or `docker pull`.

This fix tries changes `maxDownloadConcurrency` and
`maxUploadConcurrency` to adjustable by passing
`--max-concurrent-uploads` and `--max-concurrent-downloads` to
`docker daemon` command.

The documentation related to docker daemon has been updated.

Additional test case have been added to cover the changes in this fix.

This fix fixes #20936. This fix fixes #22443.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7368e41c07c21a1e2c6a49abecd1c2fc76404e49
Component: engine
2016-05-11 19:44:54 -07:00
7884e766dc Add disk quota support for btrfs
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Upstream-commit: 401c8d17674379d9b727d25df2d560a2dfe07f27
Component: engine
2016-05-05 14:35:13 +08:00
79ba4ce6e9 Update the docker daemon to dockerd for document
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 24ec73f754da16e37726a3f1c6a59de508e255fc
Component: engine
2016-04-29 09:06:02 +08:00