Commit Graph

720 Commits

Author SHA1 Message Date
Victor Vieux 45ea947e0e OverCommit -> Usable
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-14 00:40:55 +00:00
Victor Vieux d57eca7bc9 move overcommit outside of the strategies
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-14 00:33:49 +00:00
Victor Vieux d8b609c161 Move overcommit outside of binpacking and use 105 instead of 0.05
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-14 00:33:49 +00:00
Victor Vieux 2e156fb692 Merge pull request #240 from lowensk/master
Fix typos and whitespace
2015-01-13 14:16:13 -08:00
Keegan Lowenstein 89e482b633 Fix typos and whitespace
Signed-off-by: Keegan Lowenstein <keegan.lowenstein@gmail.com>
2015-01-13 14:13:01 -08:00
Victor Vieux cccbd0baea lowercase help
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-13 21:58:15 +00:00
Victor Vieux 59ea9e5681 Merge pull request #232 from vieux/ip_discovery
Proposal: add a `list` discovery service to give a list of ips
2015-01-13 13:53:18 -08:00
Victor Vieux 6e79a0e345 add tabs in the help
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-13 21:42:55 +00:00
Victor Vieux f8825b644b rename list to nodes
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-13 19:56:53 +00:00
Victor Vieux 7d7a8e0cba add doc
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-13 19:47:36 +00:00
Victor Vieux 957fce6a6c use list of IPs as a discovery
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-13 19:47:36 +00:00
Andrea Luzzardi 336c1e265e Merge pull request #237 from vieux/use_tcp_doc
use tcp:// in doc and update copyrights
2015-01-13 14:04:12 +01:00
Victor Vieux 1e678662a2 Merge pull request #238 from mota/syntax-cleanup
Syntax cleanup
2015-01-12 17:17:03 -08:00
Pierre Wacrenier 4cd7a4e8e3 More canonical Container creation in inspectContainer
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
2015-01-13 02:12:16 +01:00
Pierre Wacrenier 044b332759 createRouter doesn't yield errors
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
2015-01-13 02:02:01 +01:00
Pierre Wacrenier f7735d629b More canonical Event construction on node event handling
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
2015-01-13 01:57:29 +01:00
Victor Vieux a638b360ae use tcp:// in doc and update copyrights
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-12 22:58:03 +00:00
Victor Vieux a24e29de3f fix test zk
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-12 22:28:59 +00:00
Victor Vieux 030c715007 Merge pull request #231 from chanwit/cleanup-zookeeper
Cleanup: zookeeper discovery's watcher
2015-01-12 14:20:34 -08:00
Victor Vieux 3cc61b728f improve addr validation
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-12 22:18:59 +00:00
Victor Vieux c76c29fd11 Merge pull request #235 from aluzzardi/public-node
Container: Make Node public instead of exposing it through Node().
2015-01-12 11:14:48 -08:00
Andrea Luzzardi 87ac21d9e0 Merge pull request #208 from vieux/protocol
Proposal: standardise protocols : only ip:port
2015-01-12 19:15:49 +01:00
Andrea Luzzardi 94cf009e46 Container: Make Node public instead of exposing it through Node().
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-12 08:14:11 -08:00
Chanwit Kaewkasi 03f4650ac7 add unit test for the cleanup
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-10 00:53:16 +07:00
Chanwit Kaewkasi 1b8166c7a5 callback 1 time before looping over the zookeeper's event channel
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-10 00:52:49 +07:00
Victor Vieux 3dfc92639c add docker cp support
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-09 00:34:29 +00:00
Victor Vieux 429965c58d ip:port, no proto or scheme
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-08 22:12:41 +00:00
Victor Vieux d28dafa893 update discovery/README.md
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-08 22:11:10 +00:00
Victor Vieux 57ca80bdce Merge pull request #223 from chanwit/zookeeper-discovery
Proposal: ZooKeeper discovery
2015-01-08 14:08:41 -08:00
Andrea Luzzardi e5cc8636bd Merge pull request #224 from vieux/fix_proxy_tls
fix proxy function with TLS
2015-01-08 14:03:48 +01:00
Chanwit Kaewkasi f530d0886f implement a proper zookeeper watcher
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-08 19:34:54 +07:00
Chanwit Kaewkasi 5d5d7bf430 mark zookeeper discovery implemented
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-08 19:34:53 +07:00
Chanwit Kaewkasi 1e2e60806d double check if someone delete /path outside swarm
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-08 19:34:52 +07:00
Chanwit Kaewkasi 66ff423861 make node registration more robust
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-08 19:34:50 +07:00
Chanwit Kaewkasi de2081fa19 skip ErrNodeExists for node registration
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-08 19:34:49 +07:00
Chanwit Kaewkasi 195ba02473 add a unit test for zk discovery
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-08 19:34:48 +07:00
Chanwit Kaewkasi 3564e38d80 add zookeeper discovery
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-08 19:34:46 +07:00
Andrea Luzzardi 322c5476e9 Merge pull request #222 from mountkin/master
make use of the "pullImage" parameter of node.Create method
2015-01-07 14:06:49 +01:00
mountkin 509dcd362f add test cases for node.Create method
Signed-off-by: mountkin <mountkin@gmail.com>
2015-01-07 12:43:13 +08:00
Victor Vieux 9c5896f65c Merge pull request #218 from chanwit/check-dup-id
Proposal: report error when two Docker's IDs are duplicated
2015-01-06 17:58:21 -08:00
Victor Vieux 20018ff141 add tls to hijack as well
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-07 01:56:45 +00:00
Victor Vieux 6552c7c884 fix proxy function with TLS
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-07 01:55:56 +00:00
Victor Vieux d364332bb6 Merge pull request #200 from vieux/exec_support
docker exec support
2015-01-06 17:54:04 -08:00
Victor Vieux 12d4cf53f7 Merge pull request #220 from vieux/apiversion
add more fields to /version
2015-01-06 11:47:54 -08:00
mountkin e66a6b2793 make use of the "pullImage" parameter of node.Create method
Signed-off-by: mountkin <mountkin@gmail.com>
2015-01-06 17:46:37 +08:00
Chanwit Kaewkasi 93026e166a adjust error report to be a single entry
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-06 09:08:55 +07:00
Victor Vieux ea171b3243 add more fields to /version
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-06 00:27:46 +00:00
Victor Vieux bc94c6c810 Merge pull request #216 from lukemarsden/tweak-readme
Clarify README
2015-01-05 13:40:58 -08:00
Victor Vieux 7361b986f5 Merge pull request #217 from aluzzardi/initialize-typo
Typo: Initialise -> Initialize.
2015-01-05 13:29:50 -08:00
Chanwit Kaewkasi 5f6a257e0c report error when two Docker's IDs are duplicated
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-05 23:54:37 +07:00