Commit Graph

678 Commits

Author SHA1 Message Date
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
Victor Vieux ab4ca301ab add simple api tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-09 00:19:50 +00:00
Victor Vieux ebe77641c7 prevent panic in random strategy if no node
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-09 00:19:24 +00:00
Victor Vieux 21ee7e1a13 error when name already exists in docker run
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-09 00:18:22 +00:00
Victor Vieux 541cb74e84 error when docker run without -d
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-08 21:43:03 +00:00
Andrea Luzzardi b101b6a36a Merge pull request #159 from docker/improve-readme-consistency
Improve readme consistency
2014-12-08 13:37:18 -08:00
Victor Vieux e4655e1128 update node_ip
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-08 21:26:28 +00:00
Victor Vieux d6e91bba23 remove go install and use go get -u
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-08 21:17:17 +00:00
Victor Vieux 814fc6e8d2 simplify code
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-07 01:02:05 +00:00
Victor Vieux 2597f38327 Add Contributing doc
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-07 00:54:19 +00:00
Victor Vieux 926e8e11f1 add --api-enable-cors on swarm manage
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-06 23:04:08 +00:00
Andrea Luzzardi 496377d998 Node: Refuse to connect to unsupported Docker engine versions.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-12-05 14:59:40 -08:00
Rob b7b1c977a1 Remove duplicated join commands. 2014-12-05 14:52:08 +01:00
Rob 73b4ed57e5 Rename docker_daemon_ip1 to public_node_ip for clarity. 2014-12-05 14:51:34 +01:00
Rob e48ee45412 Update the example port to the new official Docker port. 2014-12-05 14:50:29 +01:00
Victor Vieux f9f83aae1f Merge pull request #151 from tenp/master
Fix spelling in README
2014-12-05 13:25:10 +01:00
Thimo 3f05f82bc6 Fix spelling in README 2014-12-05 12:56:45 +01:00
Andrea Luzzardi 06949c5532 Add a note about swarm node setup in the README. 2014-12-04 16:37:44 -08:00
Andrea Luzzardi 172ca9d5aa Improve formatting of discovery README. 2014-12-04 12:44:40 -08:00
Andrea Luzzardi d2b6522ce9 Add a README file for discovery explaining the API. 2014-12-04 12:35:30 -08:00
Andrea Luzzardi 6604d92c41 Add build status to the README file. 2014-12-04 10:48:59 -08:00
Andrea Luzzardi 45d5740b07 Add travis-ci.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-12-04 09:31:07 -08:00
Andrea Luzzardi 2e7d972755 Cluster: Match NodeName/ContainerId as well as NodeId/ContainerId.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-12-03 15:10:11 -08:00
Victor Vieux b8584f839d Update README.md 2014-12-03 23:45:35 +01:00
Victor Vieux f8245da596 fix tests 2014-12-03 12:56:29 +00:00
Victor Vieux f3f4ab5153 Update README.md 2014-12-03 13:51:09 +01:00
Victor Vieux ff2acaeb46 Update README.md 2014-12-03 13:47:12 +01:00
Victor Vieux d94a949934 Update README.md 2014-12-03 13:45:18 +01:00
Victor Vieux 94ea6a43ee Update README.md 2014-12-03 13:44:04 +01:00
Victor Vieux 42909c9daf update for dockerclient 2014-12-03 12:28:05 +00:00
Solomon Hykes 23db3553ec s/swarmd/swarm/ 2014-12-03 13:23:18 +01:00
Solomon Hykes 5eb33460e6 Clearer explanation in README 2014-12-03 13:22:37 +01:00