Commit Graph

809 Commits

Author SHA1 Message Date
Victor Vieux bb4db048ec 660 -> 600
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-16 01:12:56 +00:00
Victor Vieux c2c790e6da update README.mds
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-15 23:04:00 +00:00
Victor Vieux 6e39962998 -addr -> multiple -H + unix
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-15 23:02:23 +00:00
Victor Vieux 875f9e7214 fix swarm create
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-13 21:10:29 +00:00
Andrea Luzzardi e9fd1e7d98 Merge pull request #169 from vieux/create_fct_remove
remove useless create fct
2014-12-12 17:34:16 -08:00
Victor Vieux 98015c6e62 remove useless create fct
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-13 01:21:38 +00:00
Victor Vieux 75d154ef60 Merge branch 'add_few_tests' 2014-12-13 01:20:03 +00:00
Victor Vieux d6baf8bbe2 add a few tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-13 01:18:45 +00:00
Andrea Luzzardi 88bff68a5a Merge pull request #167 from vieux/update_watch
watch take a callback
2014-12-12 17:10:38 -08:00
Victor Vieux e2b6f00c23 WatchCallback
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-13 01:04:16 +00:00
Andrea Luzzardi 264dce3cc6 Merge pull request #168 from vieux/strategy_flag
add --strategy to choose the strategy to use
2014-12-12 17:03:37 -08:00
Victor Vieux 9196927ce2 nitpick
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-13 00:56:37 +00:00
Victor Vieux 88849295ed remove useless functs
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-13 00:23:52 +00:00
Victor Vieux cd243cfa34 simplify
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-13 00:09:38 +00:00
Victor Vieux b1e80ce157 add --strategy to choose the strategy to use
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-12 23:57:27 +00:00
Victor Vieux f2ca549f46 cleaner callback
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-12 22:49:20 +00:00
Victor Vieux a0dd4b9fe8 update README.md
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-12 22:19:09 +00:00
Andrea Luzzardi 9068f81761 Merge pull request #166 from vieux/proxy
proxy simple requests
2014-12-12 14:14:45 -08:00
Victor Vieux 005b5fe288 watch take a callback 2014-12-12 22:14:11 +00:00
Victor Vieux ebf33b3429 log.Println -> log.Debugf
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-12 21:37:06 +00:00
Andrea Luzzardi c85b0a9c39 Merge pull request #164 from vieux/discovery
Discovery Service backends token/etcd/file
2014-12-12 12:04:47 -08:00
Victor Vieux 9c48754a06 Update .travis.yml 2014-12-12 11:57:00 -08:00
Victor Vieux 953f850dbe Update .travis.yml 2014-12-12 11:52:25 -08:00
Victor Vieux aebec2890a proxy simple requests
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-12 19:50:40 +00:00
Victor Vieux ea7264b508 Update .travis.yml 2014-12-12 11:35:21 -08:00
Victor Vieux df7a4e6858 Update .travis.yml 2014-12-12 11:15:23 -08:00
Victor Vieux d7dfc564e5 Update .travis.yml 2014-12-12 10:53:10 -08:00
Victor Vieux 4cd12777c4 update ROADMAP.md
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-12 18:50:56 +00:00
Andrea Luzzardi f72839a8fa README: Update Docker requirement (v1.4.0 and later). 2014-12-11 18:39:53 -08:00
Victor Vieux 008398cc99 update READMEs
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 23:32:48 +00:00
Victor Vieux 1f9eac7fd1 Initialize in the interface
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 23:23:10 +00:00
Victor Vieux d891711f8c Merge pull request #165 from aluzzardi/fix-cluster-lookup
Cluster: Fix empty name container lookup.
2014-12-11 14:21:58 -08:00
Victor Vieux f95f943b4a use 1.5*heartbeat as TTL in etcd
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 22:18:54 +00:00
Victor Vieux 2282fc89ef add node type
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 21:59:01 +00:00
Victor Vieux 875e7c7e77 add discovery/README.md 2014-12-11 21:18:13 +00:00
Andrea Luzzardi db32b29a79 Cluster: Fix empty name container lookup.
Fixed a bug which caused Swarm to issue an error when creating more than
one container with no name.

Added tests for container lookups.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-12-10 18:06:02 -08:00
Victor Vieux c38f621425 add etcd
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 01:24:19 +00:00
Victor Vieux 3d39101ff7 allow custom url on token
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 01:24:19 +00:00
Victor Vieux f04af68d3f update file 2014-12-11 01:24:19 +00:00
Victor Vieux 2e6c8cc00c update README.md 2014-12-11 01:24:19 +00:00
Victor Vieux 0aeb1771bd add watch interface 2014-12-11 01:24:19 +00:00
Victor Vieux ef9b509d07 add file
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 01:24:19 +00:00
Victor Vieux bb7f69fd9c First step toward modular discoevery services
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 01:24:19 +00:00
Victor Vieux 495080fc80 update tests because of dockerclient last update
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 01:13:47 +00:00
Andrea Luzzardi 20f332b8d2 Merge pull request #162 from docker/roadmap
add ROADMAP.md
2014-12-10 13:00:27 -08:00
Victor Vieux f6ce4222a3 add ROADMAP.md
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-10 00:24:30 +00:00
Victor Vieux c1b6f2fddc Merge pull request #160 from aluzzardi/tls
TLS support.
2014-12-09 13:45:27 -08:00
Andrea Luzzardi 39fe73a231 TLS support.
TLS authentication support between the CLI and Swarm but also between
Swarm and the Docker nodes.

Closes #148.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-12-09 13:43:25 -08:00
Victor Vieux c6815ee1fe add test and remove unused funcs
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-09 01:39:39 +00:00
Victor Vieux d1d8bd5356 add a few tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-09 01:23:02 +00:00