Commit Graph

176 Commits

Author SHA1 Message Date
Nishant Totla e7b8b4c6eb Merge pull request #2375 from NanXiao/error-handle-in-postContainersCreate
Check r.ParseForm() error in postContainersCreate().
2016-07-05 10:17:21 -07:00
allencloud 728dde46ef remove engine details in volume and network api
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-30 19:58:26 +08:00
NanXiao c5e1bca7dc Check r.ParseForm() error in postContainersCreate().
Signed-off-by: NanXiao <nan@chinadtrace.org>
2016-06-29 11:07:44 +08:00
Dongluo Chen b3205ca161 Merge pull request #2288 from nishanttotla/refactoring-img-handling
Refactoring code around image ref generation
2016-06-14 14:34:20 -07:00
allencloud 9663b5e46f return VolumesListResponse in /volumes API
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-29 11:51:47 +08:00
Nishant Totla e782541d99
Refactoring code around image ref generation
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-26 10:37:39 -07:00
Nishant Totla 82f1bfe0ec
Changing relevant function calls for updated engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-25 15:47:06 -07:00
Dongluo Chen 04b70bff15 Merge pull request #2154 from xianlubird/master
Fix the bug that start container mess the host config
2016-04-29 17:02:08 -07:00
Victor Vieux 9dd298589d Merge pull request #2177 from jimmyxian/add-support-ps-filter-volume
add support ps --filter volume
2016-04-28 17:59:44 -07:00
xianlubird a3986cac05 Fix the bug that start container mess the host config
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
2016-04-28 10:32:41 +08:00
Xian Chaobo f39ac0e2c2 add support ps --filter volume
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-04-27 15:10:54 +08:00
Nishant Totla c70f836e88
Remove type unnecessary type conversion
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-26 13:42:17 -07:00
Sun Hongliang 4d9e8dc42d return immediately when getting an httpError to avoid response mixture
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-27 01:00:10 +08:00
Dongluo Chen 78bacff06a Merge pull request #2131 from jimmycmh/master
Fix bug: stop/restart/kill an inexisting container returns 500 rather than 404
2016-04-15 19:25:40 -07:00
menghui.chen 4a54b63c42 Fix bug: stop/restart/kill an inexisting container returns 500 rather than 404
Signed-off-by: menghui.chen <menghui.chen@alibaba-inc.com>
2016-04-15 19:32:29 +08:00
Nishant Totla 8d99298648
Fix deprecated config for engine < 1.7, image pull waits for end of
response

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:37:01 -07:00
Nishant Totla 11df80601c
Updating cluster
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:36:59 -07:00
Nishant Totla 81e1528d0f
Updating API handlers
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:36:59 -07:00
Nishant Totla 79575f3df6
Updating ContainerConfig to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:36:59 -07:00
Nishant Totla 1dee9cb3f0 Returning and handling error from HTTPClientAndScheme
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-08 13:36:06 -07:00
Victor Vieux b300f73a45 more network
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-25 15:40:37 -07:00
Victor Vieux 5e13bcf8ff use engine-api for network create
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-25 15:35:04 -07:00
Nishant Totla 8a003a5fa8 Reusing ImageListOptions for ImageFilterOptions
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-30 11:00:05 -07:00
Nishant Totla 7de9f6ee62 Moving over images to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-30 09:46:38 -07:00
Dongluo Chen d2bbd6bc19 Merge pull request #2038 from allencloud/make-2xx-response-status-codes-compatile-with-docker
make 2xx response status code compatible with docker engine
2016-03-29 23:06:55 -07:00
Sun Hongliang 7402cf6354 make 2xx response status code compatible with docker
1. POST /images/load    from 201 to 200
2. POST /images/{name:.*}/tag from 200 to 201
3. POST /containers/{name:.*}/rename from 200 to 204

Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-30 08:50:18 +08:00
Morgan Bauer 4516d1ae16
use apiClient for volumes management
- create volume
 - list volumes

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 15:01:27 -07:00
Morgan Bauer 0be5b31f27
use apiClient for listing networks in refresh
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Victor Vieux e98cf00409 support private images, labels and other new flags in docker build
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-24 18:27:20 -07:00
Dongluo Chen c567e4e675 Merge pull request #1987 from allencloud/log-error-when-getting-swarm-kernel-and-os-info
handle error when getting kernel and os info error
2016-03-28 15:44:43 -07:00
Dong Chen d045bd44e0 Skip redundant endpoints in "network inspect"
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-22 10:19:22 -07:00
Sun Hongliang ba0a39c518 handle error when getting kernel and os info error
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-18 00:36:11 +08:00
Dongluo Chen 85f6d57f21 Merge pull request #1972 from vieux/pass-host-config
HostConfig for /start endpoint
2016-03-16 17:19:29 -07:00
Dongluo Chen e0b5e6f5fa Merge pull request #1933 from allencloud/compatile-api-response-status-code
fix two swarm apis' response status code
2016-03-15 13:36:44 -07:00
Victor Vieux b05dee4d6e HostConfig for /start endpoint
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-14 19:23:57 -07:00
Sun Hongliang 51a63c13c8 fix three swarm api response status code
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-14 00:39:34 +08:00
Xian Chaobo e7065eabf7 add support ps node filter
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-03-11 10:31:33 +08:00
Nishant Totla 6af37c4888 Updating info function to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-09 13:58:50 -08:00
Dong Chen 69535f167a Do not recycle connections. Let net/http handles connections.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-18 18:02:10 -08:00
Victor Vieux c42142e408 Revert "Passing HostConfig for /start endpoint"
This reverts commit 6ff0d29c9d.

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-17 15:46:37 -08:00
Nishant Totla 6ff0d29c9d Passing HostConfig for /start endpoint
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-17 11:06:51 -08:00
Victor Vieux 64b9c50b69 use same HTTP client as dockerengine
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-11 15:03:38 -08:00
Victor Vieux 9a43172135 add Server Version to docker info
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-09 22:39:53 -08:00
Victor Vieux cbfdb37fde Merge pull request #1744 from nishanttotla/UpdateAPIVersion
Bump API version
2016-02-02 19:01:26 -08:00
Nishant Totla a67d3ef125 Bump API version
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-02 18:40:03 -08:00
Victor Vieux 5347098def support disconnect -f and use random engine
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-02 16:47:45 -08:00
Victor Vieux 24fe2c04e5 support docker network ls --filter type=XXX
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-02 15:57:53 -08:00
Victor Vieux 336a4ff9ae Merge pull request #1721 from nishanttotla/1625-RemoveInfoBackspaces
Removing backspaces in /info output for new API version
2016-02-01 09:30:51 -08:00
Alexandre Beslic d9c677f50b Merge pull request #1697 from jimenez/double_start
Fix double start with Mesos
2016-02-01 09:08:20 -08:00
Nishant Totla 3d7678389f Removing backspaces in /info output for new API version
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-01-31 23:54:33 -08:00