Dong Chen
c9f3471dba
add engine options for refresh interval
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-10-28 12:56:48 -07:00
Alexandre Beslic
cb7ddd1fcb
Merge pull request #1359 from vieux/update_network_types
...
update network types
2015-10-30 14:51:15 -07:00
Victor Vieux
a36a9b416c
update network types
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-30 00:03:08 -07:00
Victor Vieux
0a8cf2cf06
Merge pull request #1355 from jimmyxian/fix-push-image
...
fix push image
2015-10-29 22:00:24 -07:00
Xian Chaobo
5d1fd77aea
fix push image
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-29 20:41:28 +08:00
Victor Vieux
d2c5446ea0
Merge pull request #1340 from jimmyxian/volume-driver
...
Move VolumeDriver to HostConfig
2015-10-28 15:28:53 -07:00
Alexandre Beslic
e8dd274b65
Merge pull request #1342 from vieux/update_to_1.5.1
...
switch to go1.5.1
2015-10-28 11:47:11 -07:00
Victor Vieux
86816e7d44
Merge pull request #1287 from dnephin/fix_filter_images_by_repo
...
Fix filter images by repo
2015-10-27 21:33:25 -07:00
Xian Chaobo
0d0b99953e
Merge pull request #1349 from vieux/add_file_back_to_test_env
...
add file back to test env
2015-10-28 12:14:28 +08:00
Victor Vieux
6e9362af50
add file back to test env
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-27 21:13:12 -07:00
Alexandre Beslic
6db3956c4a
Merge pull request #1346 from vieux/fix_network_inspect
...
fix network inspect via name for global scope
2015-10-27 21:12:20 -07:00
Victor Vieux
479db2904f
fix network inspect via name for global scope
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-27 20:40:13 -07:00
Xian Chaobo
588c29c3cc
move VolumeDriver to HostConfig
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-28 10:58:24 +08:00
Daniel Nephin
e001980b5c
Add filter by image name support to /images/json
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-27 11:00:37 -04:00
Victor Vieux
b924f7f8fa
switch to go1.5.1
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-26 11:49:48 -07:00
Alexandre Beslic
ae81ef652e
Merge pull request #1338 from vieux/get_compiled_go
...
fix test Dockerfile, use precompiled go
2015-10-26 10:24:00 -07:00
Alexandre Beslic
da1f854462
Merge pull request #1310 from pwnall/image_affinity
...
Swarm filters support in image building
2015-10-23 14:54:33 -07:00
Alexandre Beslic
a7a82bd1ae
Merge pull request #1330 from vieux/fix_mesos_timeout_issue
...
fix issue with timeouts in mesos
2015-10-23 14:13:14 -07:00
Alexandre Beslic
b68183aabc
Merge pull request #1335 from vieux/fix_panic
...
fix panic when createContainer returns nil,nil
2015-10-23 14:05:33 -07:00
Victor Costan
e32b3211ae
Swarm filters support in image building.
...
When building an image (POST /build), swarm will extract filters from
buildargs. This is similar to how container creation (POST
/containers/create) extracts filters from environment variables.
Signed-off-by: Victor Costan <costan@gmail.com>
2015-10-23 14:24:42 -04:00
Victor Vieux
5146f07b83
Merge pull request #1332 from riuvshin/master
...
Fix log info message
2015-10-23 10:20:18 -07:00
Roman Iuvshin
40a22e5a13
Fix log info message
...
Signed-off-by: Roman Iuvshin <riuvshin@codenvy.com>
2015-10-23 17:22:53 +03:00
Xian Chaobo
7510c12122
Merge pull request #1327 from vieux/return_200_image_create
...
return 200 OK in /images/create
2015-10-23 09:10:42 +08:00
Victor Vieux
2eb39be3ee
Merge pull request #1329 from vieux/improve_mesos_error_message
...
improve error message in mesos
2015-10-22 16:59:00 -07:00
moxiegirl
756671ac66
Merge pull request #1324 from SvenDowideit/fix-errant-links
...
Fix some non-relative links
2015-10-22 09:29:32 -07:00
Victor Vieux
95c1147b73
return 200 OK in /images/create
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-22 09:09:09 -07:00
Sven Dowideit
c1902e1222
Fix some non-relative links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-22 17:22:25 +10:00
Alexandre Beslic
50475d5ad4
Merge pull request #1318 from jimmyxian/add-support-some-run-options
...
Add support some run options
2015-10-22 00:02:46 -07:00
Xian Chaobo
c947d5be69
add support some run options
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-22 09:14:23 +08:00
Alexandre Beslic
975eaa9e73
Merge pull request #1320 from dnephin/support_filter_networks
...
Support filtering networks by id or name
2015-10-21 17:45:56 -07:00
Alexandre Beslic
e5523c250a
Merge pull request #1321 from vieux/update_endpoint_volume_create
...
rename `POST /volumes` to `POST /volumes/create`
2015-10-21 16:17:50 -07:00
Victor Vieux
1a744d6853
Merge pull request #1317 from abronan/add_concurrent_port_test
...
Integration test for regression with parallel docker run when specifying a port
2015-10-21 15:50:47 -07:00
Victor Vieux
39a0a58e1c
Merge pull request #1322 from dnephin/update_api_version
...
Update api version to match the version that swarm supports
2015-10-21 14:57:57 -07:00
Daniel Nephin
cd5de97a8d
Update api version to match the version that swarm supports.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-21 15:44:02 -04:00
Daniel Nephin
a7550e9e70
Support filtering networks by id or name.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-21 14:23:26 -04:00
Alexandre Beslic
50671ab6f3
Integration test for regression with parallel docker run when specifying a port
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-21 02:59:04 -07:00
Alexandre Beslic
93e78ce641
Merge pull request #1314 from aluzzardi/fix-nullptr-pendingcontainer
...
Fix nullptr panic in pending containers.
2015-10-20 12:14:06 -07:00
Chanwit Kaewkasi
e64c5ee209
Merge pull request #1309 from vieux/improve_networks
...
small improvment on network UX
2015-10-20 17:12:38 +07:00
Alexandre Beslic
6ee3420542
Merge pull request #1315 from aluzzardi/golint-fix
...
Fix various golint issues.
2015-10-19 14:18:36 -07:00
Andrea Luzzardi
58558f5224
Fix various golint issues.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-19 13:58:21 -07:00
Andrea Luzzardi
31cba69ac6
Merge pull request #1313 from denverdino/origin-master
...
Fix the problem for the orders of filters
2015-10-19 13:56:49 -07:00
Andrea Luzzardi
0399a3c60b
Fix nullptr panic in pending containers.
...
Fixes #1289
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-19 13:38:06 -07:00
Victor Vieux
2c2aa91f9f
fix test Dockerfile, use precompiled go
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-19 09:55:27 -07:00
Li Yi
135bee98c9
Fix the problem for the orders of filters
...
Change-Id: I2dd652a1881cdaaff16e02f26c9f69f5df16419f
Signed-off-by: Li Yi <denverdino@gmail.com>
2015-10-19 23:07:20 +08:00
Victor Vieux
21d6fc5378
fix panic when createContainer returns nil,nil
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-18 21:22:59 -07:00
Victor Vieux
10d232fe66
fix issue with timeouts in mesos
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-18 14:39:16 -07:00
Victor Vieux
a2a8596238
improve error message in mesos
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-18 10:41:02 -07:00
Victor Vieux
6643894063
rename `POST /volumes` to `POST /volumes/create`
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-17 23:50:50 -07:00
Victor Vieux
f9807f561c
fix golint
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-17 01:32:44 -07:00
Victor Vieux
07a102adc8
fix tests
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-19 15:46:38 -07:00