Commit Graph

844 Commits

Author SHA1 Message Date
Victor Vieux adad1f0f75 add docker stats support
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-21 23:28:41 +00:00
Andrea Luzzardi 45644d8412 Merge pull request from vieux/fix_usage
use <> in the usage and update README.mds
2015-01-21 14:55:13 -08:00
Victor Vieux e9f487bcaf update README.mds
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-21 22:47:31 +00:00
Victor Vieux 9f4e3ffb3b use <> in the usage
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-21 22:41:01 +00:00
Andrea Luzzardi 3607fc47c3 Merge pull request from vieux/no_discovery_flag
replace --discovery by argument
2015-01-21 14:28:40 -08:00
Victor Vieux 09f38991ac replace command by swarm in usage
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-21 20:11:17 +00:00
Victor Vieux 7b5683fa94 Merge pull request from aluzzardi/bump-version
Bump version
2015-01-21 12:09:22 -08:00
Victor Vieux 3fe99c7067 replace --discovery by argument
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-21 19:59:27 +00:00
Andrea Luzzardi 5f578aa7e0 Change app description to match GH.
Running **swarm** will yield:
```
NAME:
   swarm - a Docker-native clustering system
```

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-21 11:53:27 -08:00
Andrea Luzzardi 31a41509a4 Bump version to 0.1.0
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-21 11:52:16 -08:00
Andrea Luzzardi 10074faa75 Merge pull request from vieux/chanwit-constraints-expr
Proposal: constraint & affinity filter expression enhancement
2015-01-20 16:38:24 -08:00
Victor Vieux e546965cf3 refactor and remove <= and >=
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-21 00:24:51 +00:00
Victor Vieux 3668d7694a Merge pull request from jhamrick/test-binpacking
Add test that fails to execute the proper binpacking strategy
2015-01-20 15:10:50 -08:00
Jessica B. Hamrick 634dd00497 Remove unnecessary arguments from Equal and NotEqual
Signed-off-by: Jessica B. Hamrick <jhamrick@berkeley.edu>
2015-01-20 15:08:01 -08:00
Jessica B. Hamrick 63109bb0f2 Remove total variable
Signed-off-by: Jessica B. Hamrick <jhamrick@berkeley.edu>
2015-01-20 11:42:02 -08:00
Chanwit Kaewkasi bf852ec243 update expression syntax in doc
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 15:45:38 +07:00
Chanwit Kaewkasi 3c147df81a remove unsupported operators
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 15:45:36 +07:00
Chanwit Kaewkasi e4db376a6d support affinity and validate key and value properly
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 15:44:55 +07:00
Chanwit Kaewkasi 45b7f26394 refactor matching into filter/utils.go
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 10:42:23 +07:00
Jessica B. Hamrick 11ebdb050c Fix the scheduling bug, fixes
Signed-off-by: Jessica B. Hamrick <jhamrick@berkeley.edu>
2015-01-19 19:19:35 -08:00
Jessica B. Hamrick f942cb2e69 Add test that fails to execute the proper strategy
Signed-off-by: Jessica B. Hamrick <jhamrick@berkeley.edu>
2015-01-19 19:19:32 -08:00
Chanwit Kaewkasi d77c9596b1 add double equals comparison
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 10:04:19 +07:00
Chanwit Kaewkasi 7ee722b2d7 support relative comparisons in constraints
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 10:03:34 +07:00
Chanwit Kaewkasi d335f59757 implement alternative negation syntax
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 10:02:13 +07:00
Chanwit Kaewkasi 25231f3bb3 fix test failed per rebase
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 10:02:12 +07:00
Chanwit Kaewkasi 5b973d0057 improve to allow optional matching with case-insensitivity
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 10:02:10 +07:00
Chanwit Kaewkasi b4a7abdc83 add a testcase for escape regexp
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 10:02:09 +07:00
Chanwit Kaewkasi 790b1ea45d cleanup and add comments
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 10:02:07 +07:00
Chanwit Kaewkasi 564cca1a22 explain expression syntax in README
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 10:02:05 +07:00
Chanwit Kaewkasi 54c7c12d05 improve regexp matching
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 10:00:48 +07:00
Chanwit Kaewkasi 37e10e9656 support not in constraints expressions
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-20 10:00:12 +07:00
Victor Vieux 829bcb562d fix SWARM_DISCOVERY env var
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-20 01:12:10 +00:00
Victor Vieux 59fb880b75 emitCustomEvent -> emitEvent
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-19 22:38:42 +00:00
Victor Vieux 08a17cd2e6 Merge pull request from mountkin/master
restart the event monitor when unhealthy node comes back
2015-01-19 14:37:51 -08:00
Andrea Luzzardi 944ac685ef Merge pull request from vieux/docker_images
Proposal: Simple docker images support
2015-01-19 14:06:47 -08:00
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 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 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