Commit Graph

809 Commits

Author SHA1 Message Date
Victor Vieux 741c2848f4 add docker images support
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-19 22:02:32 +00:00
Andrea Luzzardi 1e92f854d5 Merge pull request #243 from vieux/affinity
add affinity (start next to a container/image)
2015-01-19 14:02:03 -08:00
Victor Vieux 1dfb7ffb70 add untag and delete
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-19 21:58:46 +00:00
Victor Vieux 110c3b6c39 Merge pull request #236 from aluzzardi/state-store
Store requested state persistently.
2015-01-19 13:43:11 -08:00
Andrea Luzzardi 7161549693 store: Change the default path to ~/.swarm.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-19 13:39:24 -08:00
Andrea Luzzardi 562febe2f9 state: Store container ID in requested state.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-19 13:25:27 -08:00
Victor Vieux 01715e786b Merge branch 'giampierod-master' 2015-01-19 20:51:37 +00:00
Gp De Ciantis e255413b0a Fixed spelling error 'Healty' to 'Healthy'
Signed-off-by: Gp De Ciantis <gdeciantis@gmail.com>
2015-01-19 20:50:54 +00:00
mountkin d5c5df9f1b refresh the node specs when an unhealthy node reconnects to the cluster
Signed-off-by: mountkin <mountkin@gmail.com>
2015-01-19 19:27:54 +08:00
mountkin fda3606be3 add a "node_connect" custom event when a node joins the cluster
Signed-off-by: mountkin <mountkin@gmail.com>
2015-01-19 19:27:41 +08:00
mountkin 34b845efab rename custom events
Signed-off-by: mountkin <mountkin@gmail.com>
2015-01-19 18:46:54 +08:00
mountkin 7d4bbcd59a emit a custom event when a node dies or comes back
Signed-off-by: mountkin <mountkin@gmail.com>
2015-01-19 18:46:54 +08:00
mountkin a3f0c1643f restart the event monitor when unhealthy node comes back
Signed-off-by: mountkin <mountkin@gmail.com>
2015-01-19 18:46:54 +08:00
Victor Vieux a0901ce8d6 remove useless print
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-17 01:24:31 +00:00
Victor Vieux e1c2dced23 refactor Images() and refresh images on pull event
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-16 22:33:58 +00:00
Andrea Luzzardi c0d0b68fca Merge pull request #250 from vieux/hostname_join
allow hostnames in join
2015-01-16 18:01:33 +01:00
Victor Vieux bcbd0fec0f allow hostnames in join
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-16 01:47:38 +00:00
Victor Vieux 98914a122c tweak doc
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-16 00:10:36 +00:00
Victor Vieux 5a85211449 add images test
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-16 00:10:36 +00:00
Victor Vieux 5564894744 add images cache
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-16 00:10:36 +00:00
Victor Vieux d54c5f8046 add doc
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-16 00:10:36 +00:00
Victor Vieux ccee1f67e8 add affinity:
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-16 00:10:36 +00:00
Andrea Luzzardi 6410f9ad35 Store requested state persistently.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-15 23:10:50 +00:00
Victor Vieux 01633efaa0 fix issue with hostname
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-15 23:10:07 +00:00
Victor Vieux 29df40f95f Merge pull request #246 from vieux/add_search_login
add search and login
2015-01-15 11:35:10 -08:00
Victor Vieux 7260a66886 use HealthFilter
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-15 19:32:48 +00:00
Victor Vieux 93d63a3fea add search and login
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-15 19:19:09 +00:00
Victor Vieux 3f55099c06 Merge pull request #234 from aluzzardi/store
Add a simple key<->Container persistent store.
2015-01-15 11:16:04 -08:00
Victor Vieux 32c135314d fix headers
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-15 00:59:38 +00:00
Victor Vieux 9fdb28ebd4 Merge branch 'fix_inspect' 2015-01-14 22:34:13 +00:00
Victor Vieux a0f3f3440b fix inspect
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-14 22:33:24 +00:00
Andrea Luzzardi 750ab8f60f Store: Improve error handling.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-14 08:35:07 -08:00
Andrea Luzzardi a403a99c1c Merge pull request #242 from vieux/fix_tls_proxy
fix tls in proxy func
2015-01-14 14:59:59 +01:00
Andrea Luzzardi 61081ec6d2 Merge pull request #228 from vieux/overcommit
Move overcommit outside of binpacking
2015-01-14 14:33:30 +01:00
Victor Vieux f0e9fb032d prevent undercommit for now
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-14 00:57:13 +00:00
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 0885c7b5b8 fix tls in proxy func
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-13 22:02:09 +00: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