Commit Graph

1183 Commits

Author SHA1 Message Date
Chanwit Kaewkasi 8bac536980 fix test case per refactoring
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 01:23:34 +07:00
Chanwit Kaewkasi 1fd19c41ef update port filter document for host mode
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:32:13 +07:00
Chanwit Kaewkasi 83848918da add test case for the host mode
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:32:11 +07:00
Chanwit Kaewkasi 6102c1d357 add port filter for the host mode
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:32:10 +07:00
Victor Vieux 76808b8509 Merge pull request #605 from jimmyxian/master
Update api README.md
2015-04-09 00:12:31 -07:00
Xian Chaobo 6306fe3b64 Update README.md
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-09 10:44:28 +08:00
Alexandre Beslic caa5fd0351 Merge pull request #596 from vieux/fix_docker_inspect
fix node field in docker inspect
2015-04-08 14:12:16 -07:00
Victor Vieux d1c41e0d43 fix node field in docker inspect
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-08 14:09:57 -07:00
Alexandre Beslic 14108ccaa1 Merge pull request #517 from gegere/readme/update
Adding additional notes for installing Go via Homebrew on Mac OS X
2015-04-08 02:11:34 -07:00
Jason Gegere b45518c14b Adding additional notes for installing Go via Homebrew on Mac OS X
Signed-off-by: Jason Gegere <jason@hgmail.com>
2015-04-07 20:37:23 -06:00
Andrea Luzzardi 758612896d Merge pull request #584 from noxiouz/remove_extra_rlock
[SwarmCluster] Remove extra RLock in node.Container
2015-04-07 19:01:08 -07:00
Anton Tiurin e66abdf7bb [SwarmCluster] Remove an extra RLock in Engine.Container
Engine.Container uses an array of containers from Engine.Containers, which is
built under an internal RLock, so the external RLock is useless.
Also allocate enough memory for the array of containers (images).

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
2015-04-08 00:41:28 +03:00
Victor Vieux 3cf6cde494 Merge branch 'jangelfdez-patch' 2015-04-07 14:36:57 -07:00
jangelfdez 17b9b96b33 Doc changed to avoid errors with POST calls to Docker Hub Discovery Service API
The data on the "Add new nodes to a cluster" request may be confusing. It's not a key=value pair as it can be understood with the current docs.

Signed-off-by: jangelfdez <me@joseangelfernandez.es>
2015-04-07 14:36:07 -07:00
Andrea Luzzardi 530d5670a4 Merge pull request #574 from vieux/node_engine
Transform `node interface` to `engine struct`
2015-04-07 14:11:58 -07:00
Alexandre Beslic 8590a1c69a Merge pull request #586 from jimmyxian/attach-ws
Implement docker attach-ws api
2015-04-07 13:48:14 -07:00
Xian Chaobo 71cbef03dc update README.md
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-08 03:50:23 +08:00
Xian Chaobo 18f1095e7e implement attach-ws api
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-08 03:48:58 +08:00
Victor Vieux 853aaf6027 nodes -> engines
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-07 11:46:33 -07:00
Victor Vieux fa10490af8 Merge branch 'sunyc-ignore_comment' 2015-04-07 10:41:25 -07:00
Victor Vieux 5e41510484 udpate tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-07 10:41:18 -07:00
Yucong Sun b45a985b9b Ignoring # comments in file discovery.
Signed-off-by: Yucong Sun <sunyucong@email.com>
2015-04-07 23:11:57 +08:00
Victor Vieux 0c1782c7c0 fix proxyRandom and cleanup node -> engine
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-06 13:38:10 -07:00
Victor Vieux 1297a4cef2 transform node interface to engine struct
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-06 13:19:37 -07:00
Victor Vieux 48fd99368f Merge pull request #579 from chanwit/regression
Cleanup: regression for 0.2.0
2015-04-06 12:08:09 -07:00
Chanwit Kaewkasi b1803bc7e5 regression for 0.2.0
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-06 14:04:15 +07:00
Alexandre Beslic 88b69e0671 Merge pull request #573 from aluzzardi/container-update-fix
Fix container update flow.
2015-04-03 17:03:14 -07:00
Victor Vieux adda54109e Merge pull request #571 from vieux/sort_info
Sort docker info by name
2015-04-03 16:39:28 -07:00
Victor Vieux 820527be7e Sort docker info by name
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-03 16:37:27 -07:00
Andrea Luzzardi c101ab7548 Merge pull request #572 from vieux/improve_docker_info
add strategy and filters to docker info
2015-04-03 16:35:39 -07:00
Victor Vieux 805b4763f4 disable cluster flag
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-03 16:33:48 -07:00
Victor Vieux 8f50c0eb7a use names everywhere
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-03 16:22:56 -07:00
Andrea Luzzardi 23d52249fa Fix container update flow.
This guarantees that containers get fully updated before being inserted
in the node (and returned by .Containers()).

Fixes #560

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-03 16:21:48 -07:00
Andrea Luzzardi b9ccbd119d Merge pull request #567 from mgoelzer/issue564
Make TTL > heartbeat interval so that keys do not disappear
2015-04-03 16:06:23 -07:00
Victor Vieux 20ec7a889e add strategy and filters to docker info
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-03 15:56:26 -07:00
Mike Goelzer bcca57bda8 Make TTL > heartbeat by at least one second to prevent key from disappearing before next heartbeat
Signed-off-by: Mike Goelzer <mike@goelzer.com>
2015-04-02 19:34:30 -07:00
Andrea Luzzardi 64d691a448 Merge pull request #566 from vieux/engine_not_swarm
add error message
2015-04-02 18:51:54 -07:00
Victor Vieux c41d73dd50 add error message
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-04-03 01:28:08 +00:00
Andrea Luzzardi de66ff37d5 Merge pull request #565 from vieux/fix_tests
unskip and fix a few tests
2015-04-02 17:50:45 -07:00
Victor Vieux f3d64cfad3 unskip and fix a few tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-04-03 00:48:07 +00:00
Victor Vieux 0131e5f92c Merge pull request #556 from chanwit/cleanup-random
Cleanup: inline index and reuse size vars in random strategy
2015-04-02 11:23:01 -07:00
Alexandre Beslic 7e569fdaee Merge pull request #561 from mgoelzer/discovery-token-readme-fix
Fixed url of Docker Hub discovery service
2015-04-02 10:05:24 -07:00
Mike Goelzer 5d289e2434 Fixed url of Docker Hub discovery service
Signed-off-by: Mike Goelzer <mike@goelzer.com>
2015-04-02 09:50:34 -07:00
Chanwit Kaewkasi fd643ad079 cleanup index and reuse size vars
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-02 13:54:39 +07:00
Victor Vieux 558b1e3c52 Merge pull request #554 from vieux/add_doc_spread
Add missing doc for the spread strategy
2015-04-01 17:29:55 -07:00
Victor Vieux 410d85ac07 Add missing doc for the spread strategy
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-01 17:20:27 -07:00
Victor Vieux 01a942c54d Merge pull request #552 from noxiouz/idiomatic_copy
[Store] Drop an index variable in Store.All
2015-04-01 15:53:37 -07:00
Victor Vieux 58b282a4a3 Merge pull request #545 from aluzzardi/synchronous-creater-destroy
Make container creation and destruction synchronous.
2015-04-01 15:41:26 -07:00
Andrea Luzzardi 1edc7b64aa Merge pull request #546 from vieux/use_1024
use 1024 as total cpushare for a machine
2015-04-01 15:27:58 -07:00
Victor Vieux b27d405dd7 Merge pull request #553 from noxiouz/reduce_complexity_of_pick
[Random] Pick a node for O(1), not for O(n)
2015-04-01 15:26:10 -07:00