Commit Graph

309 Commits

Author SHA1 Message Date
Victor Vieux 6d6927d1de fix merge issue
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 01:24:10 -07:00
Alexandre Beslic 1e30ce215f Merge pull request #1262 from vieux/libnetwork
add 'docker network' support
2015-10-13 11:09:27 -07:00
Xian Chaobo 3fc52aa81d Merge pull request #1276 from aluzzardi/strategy-rankandsort
scheduler: Return a list of candidates rather than a single node.
2015-10-13 09:31:16 +08:00
Jia Mi 660299f749 Engine should refresh the container on container rename event
Signed-off-by: Jia Mi <winters.mi@gmail.com>
2015-10-10 15:17:48 +08:00
Andrea Luzzardi b2b32d979d scheduler now returns the list of ranked nodes rather than the top node.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 15:32:37 -07:00
Victor Vieux 267d7e6701 Merge pull request #1261 from aluzzardi/parallel-scheduling
Parallel scheduling
2015-10-09 12:57:42 -07:00
Andrea Luzzardi 7c0539c650 cluster: Fix name setting of pending containers.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 12:54:57 -07:00
Andrea Luzzardi 24394612f5 cluster: Don't lock the scheduler when removing a container.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 12:54:56 -07:00
Andrea Luzzardi 91279c8256 cluster: Check name uniqueness among pending containers.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 12:54:56 -07:00
Andrea Luzzardi c64ae5168a Parallel scheduling support for Swarm driver.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 12:54:53 -07:00
Victor Vieux 3a79038d48 Merge pull request #1268 from aluzzardi/refresh-loop-cleanup
engine cleanup: Don't mess with the global random.
2015-10-09 12:52:39 -07:00
Andrea Luzzardi cb2ceea702 engine: Added a concurrent safe refresh delayer.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 11:32:03 -07:00
Victor Vieux 78ecf8497c Add network rm
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
Victor Vieux b007cae8b2 Add docker network create
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:35:07 -07:00
Victor Vieux 8559fb0fc6 remove cluster.Network(IDOrName)
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:35:07 -07:00
Victor Vieux 12c2d46dd5 prepend engine name on network name
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-08 22:35:07 -07:00
Victor Vieux e634df03a7 add 'docker network ls' support
add 'docker network inspect' suport

Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:35:07 -07:00
Andrea Luzzardi f1782fed90 engine cleanup: Don't mess with the global random.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-07 17:27:41 -07:00
Victor Vieux f5925f5a1c Fix container matching
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-07 14:18:35 -07:00
Andrea Luzzardi 13483451da engine: More robust refresh loop.
- Random heartbeat (between 30 and 60 seconds).
- Requires 3 failures before marking a node as dead.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-06 19:39:39 -07:00
Daniel Nephin 8abf7d32e9 Support filtering images by labels
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 15:45:52 -04:00
Victor Vieux e52e14b499 Merge pull request #1242 from klaus1982/master
correct mesos parameters
2015-09-29 14:26:20 -07:00
Klaus Ma 63e86289cf correct mesos parameters
Signed-off-by: Klaus Ma <klaus.ma@outlook.com>
2015-09-29 13:56:41 +08:00
Daniel Nephin 605e528274 Improve the mesos addr error message
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-24 19:43:02 -04:00
Alexandre Beslic a792519978 Merge pull request #1208 from vieux/volume_create_delete
docker volume create & docker volume delete
2015-09-23 10:45:44 -07:00
Victor Vieux 53357d88fd Merge pull request #1213 from jimmyxian/fix-import-load-return-code
Fix import/load return code
2015-09-21 17:13:07 -07:00
Victor Vieux 79d1ee4861 add volume create
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:23:22 -07:00
Victor Vieux 440a379860 docker volume rm
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-18 03:22:57 -07:00
Xian Chaobo 9afb7d324b fix connect event
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-09-17 05:18:42 -04:00
Xian Chaobo 5cc6e3f30c fix import/load return code
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-09-15 10:00:49 -04:00
Xian Chaobo a10a39c462 fix pull return code
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-09-10 04:10:28 -04:00
moxiegirl c36dd9c1df Merge pull request #1184 from ahmetalpbalkan/mesos-docs
docs: Clarify mesos driver, also line-wrapping
2015-09-09 17:12:24 -07:00
Ahmet Alp Balkan a7d8d2fcbf docs: Clarify mesos driver, also line-wrapping
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-09-09 09:54:58 -07:00
Victor Vieux 77c96908f0 add support for docker volume ls & inspect
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-05 07:56:22 -07:00
Victor Vieux d571b7e39e Revert "prevent double starts with mesos"
This reverts commit 9a93dcf46b.

Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-02 20:33:49 -07:00
Chanwit Kaewkasi 987dc06365 Merge pull request #1168 from abronan/fix_refresh
Fix panic on Container/Image refresh after Engine removal
2015-09-03 13:16:40 +07:00
Chanwit Kaewkasi 4cdbe875b8 Merge pull request #1155 from vieux/fix_mesos_logs
prevent double logs with mesos
2015-09-03 13:10:52 +07:00
Alexandre Beslic a7303ecc5e Fix panic on various calls when assigning Engine client to nil
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-09-02 09:41:51 -07:00
Victor Vieux 2fb43773cf Merge pull request #1180 from abronan/clean_state
Cleanup state folder with local file persistence
2015-09-01 17:04:28 -07:00
Victor Vieux 42bb1f3f5b Merge pull request #1159 from jimmyxian/fix-tag-images
fix tag image
2015-09-01 11:25:48 -07:00
Victor Vieux 9a93dcf46b prevent double starts with mesos
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-31 22:52:43 -07:00
Xian Chaobo 29df83a349 fix tag image
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-31 07:17:30 -04:00
Alexandre Beslic 6c1c83f7a3 Cleanup state folder with local file persistence (not used anymore)
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-08-30 17:15:52 -07:00
Xian Chaobo 12e956e681 add support force remove images
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-19 23:09:02 -04:00
Xian Chaobo 98178f3c41 Merge pull request #1152 from vieux/enable_better_refresh_mesos_0.23
enable better refresh with mesos 0.23
2015-08-15 15:50:41 +08:00
Victor Vieux 58482a13d2 enable better refresh with mesos 0.23
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-14 17:11:19 -07:00
Victor Vieux cc7b9b2176 add container name in mesos task label
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-14 13:48:49 -07:00
Xian Chaobo d4daee4f27 add support images -a
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-08-12 07:39:11 -04:00
Victor Vieux d5c41a38c1 update tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-10 23:09:52 -07:00
Victor Vieux 2a70ff3e1f display only containers created by swarm in mesos
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-10 22:51:39 -07:00