Commit Graph

844 Commits

Author SHA1 Message Date
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 from chanwit/zookeeper-discovery
Proposal: ZooKeeper discovery
2015-01-08 14:08:41 -08:00
Andrea Luzzardi e5cc8636bd Merge pull request 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 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 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 from vieux/exec_support
docker exec support
2015-01-06 17:54:04 -08:00
Victor Vieux 12d4cf53f7 Merge pull request 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 from lukemarsden/tweak-readme
Clarify README
2015-01-05 13:40:58 -08:00
Victor Vieux 7361b986f5 Merge pull request 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
Andrea Luzzardi 6a34054e58 Typo: Initialise -> Initialize.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-05 07:32:57 -08:00
Luke Marsden dc393390da Make clear that you must manually interpolate token.
Signed-off-by: Luke Marsden <luke@clusterhq.com>
2015-01-05 10:20:49 +00:00
lukemarsden dbc07ba174 Clarify README
* Make it easier for Go noobs like me to use `go get`.
* Make it clearer that `$SWARM_TOKEN` should be dynamic.

Signed-off-by: Luke Marsden <luke@clusterhq.com>
2015-01-03 22:39:41 +00:00
Victor Vieux 355ed490ce update API doc
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-31 00:19:43 +00:00
Victor Vieux 4350b44b56 refactor code
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-31 00:19:13 +00:00
Victor Vieux aefe450036 add exec support
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-31 00:19:13 +00:00
Victor Vieux d27e8a35a1 Merge branch 'JeffChien-discovery' 2014-12-31 00:17:01 +00:00
Victor Vieux cf42030741 update README.md & ROADMAP.md
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-31 00:16:54 +00:00
JChien a94a104932 use consul's watch
Signed-off-by: JChien <jeffchien13@gmail.com>
2014-12-31 00:16:03 +00:00
JChien f6b5ca38d5 fix flag usage message
Signed-off-by: JChien <jeffchien13@gmail.com>
2014-12-31 00:16:03 +00:00
JChien 6aed8aa673 fix style to match gofmt
Signed-off-by: JChien <jeffchien13@gmail.com>
2014-12-31 00:16:03 +00:00
JChien e0461c7549 fix readme and remove swarm prefix
Signed-off-by: JChien <jeffchien13@gmail.com>
2014-12-31 00:16:03 +00:00
JChien 1a21de143f add consul support as a disovery backend
Signed-off-by: JChien <jeffchien13@gmail.com>
2014-12-31 00:16:03 +00:00
Victor Vieux 65dc554e67 Merge pull request from tianon/travis
Add cross-compilation to Travis
2014-12-30 16:09:10 -08:00
Victor Vieux 28af0fc859 update API doc
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-31 00:01:04 +00:00
Tianon Gravi 8bc7cbdd17 Add cross-compilation to Travis
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-30 17:01:03 -07:00
Tianon Gravi 08af13a77f Update Travis to only gofmt against Go 1.3
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-30 16:52:29 -07:00
Victor Vieux b7e2482e4d Merge pull request from vieux/attach_support
docker run -i -t  / attach support
2014-12-30 11:35:10 -08:00
Victor Vieux 7aad288ba4 refactor code for exec coming later
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-30 19:34:20 +00:00
Andrea Luzzardi 47bfbe78a8 Merge pull request from vieux/inspect_node_info
add node name, ID and IP
2014-12-30 14:45:22 +01:00
Andrea Luzzardi 27fd017286 Merge pull request from chanwit/int-overflow
Cleanup: need int64 cast to prevent overflow on the 32-bit architecture
2014-12-30 14:31:07 +01:00
Andrea Luzzardi 644cacace9 Merge pull request from chanwit/dev
Cleanup: separate unix-related codes to make Swarm buildable on Windows
2014-12-30 14:24:46 +01:00
Chanwit Kaewkasi 869c57ccb1 need int64 cast to prevent overflow on the 32-bit architecture
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2014-12-30 15:40:54 +07:00
Chanwit Kaewkasi 6a03838179 separate unix-related codes to make Swarm buildable on Windows
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2014-12-30 11:25:49 +07:00
Victor Vieux efe72934a6 add some documentation and Node field
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-29 20:01:37 +00:00
Victor Vieux 85ef25cd89 Merge pull request from thedrow/patch-2
Added consul to the list of planned backends
2014-12-29 11:43:39 -08:00