154c412ece
Merge pull request #15798 from calavera/volume_driver_host_config
...
Move VolumeDriver to HostConfig to make containers portable.
Upstream-commit: 9ca4aa479788867cd2dce161efa1e43ea5dfc14f
Component: engine
2015-09-08 22:05:40 -04:00
4a380ba714
Don't lookup container 4 times for stats
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: dc8a39036b8c9da4c21c48f492cdbb795170bb21
Component: engine
2015-09-08 10:12:46 -04:00
d4738db561
Fix connection block when using docker stats API
...
For now CLI `docker stats` will not block even if the container was
not running is because there is a 2s timeout setting when waiting for
the response.
I think why we hang there waiting for the container to run is because we
want to get the stats of container immediately when it starts running.
But it will block when use the API directly, for example
- curl
- Google Chrome plugin, Postman
- Firefox plugin, RESTClient
This patch keeps the feature that getting info immediately when container
starts running and in the meantime, it will not block when using the API
directrly.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: d9bf8163ad8579cf2ab9f55925f9ea5037e5b525
Component: engine
2015-09-06 17:21:41 +08:00
350911ed1c
Move VolumeDriver to HostConfig to make containers portable.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 6549d6517bf9a7c79d21a86cbf36af10fcdbfbe0
Component: engine
2015-09-04 12:42:44 -04:00
434547ed08
Merge pull request #14978 from gesellix/websocket-disable-check-origin
...
skip checkOrigin during websocket handshake
Upstream-commit: e134ccada7fae12271c4169e592b8bf09aff923d
Component: engine
2015-08-25 12:56:30 -04:00
6442b64e6e
Fix build with resource limit which system is not support.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 770daa15f359ddc7329a2a031332c251e5a53a29
Component: engine
2015-08-18 11:54:00 +08:00
c6ac4667d6
skip checkOrigin during websocket handshake
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 9bde19e72a59a2af2dcbc72abf2521fa02718bcc
Component: engine
2015-08-12 00:05:59 +02:00
2c6e673ce7
typofix - https://github.com/vlajos/misspell_fixer
...
Signed-off-by: Veres Lajos <vlajos@gmail.com >
Upstream-commit: 514623272398574c8fd7ef3fe42c5b2ae161349a
Component: engine
2015-08-07 23:25:49 +01:00
3ec8bc1fa3
Cleanup: Merge adjustCPUShares to adoptContainerSettings
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: e0af23dc18eac17633ab1f2541f26b56c303a18c
Component: engine
2015-08-06 08:15:14 +08:00
0cd1b722f7
Split API handlers into domain specific files
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 1a77580030439cef25e8f987b03733f173662746
Component: engine
2015-08-03 11:12:44 -04:00
