Commit Graph

809 Commits

Author SHA1 Message Date
Andrea Luzzardi 45dbe6b73f flags: Cleanup the homepath() function.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-22 15:04:14 -08:00
Victor Vieux 9dd96077c3 Merge pull request #266 from MDrollette/cross-compile
use cross-compile compatible home dir detection
2015-01-22 14:46:23 -08:00
Andrea Luzzardi 568cb6f7cb Merge pull request #277 from vieux/log_join
add info in join
2015-01-22 14:44:32 -08:00
Matt Drollette a66abedab5 use cross-compile compatible home dir detection
Signed-off-by: Matt Drollette <matt@drollette.com>
2015-01-22 16:41:21 -06:00
Victor Vieux 5062e47711 add info in join
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-22 22:40:50 +00:00
Andrea Luzzardi 3106f042c0 Merge pull request #276 from vieux/cleanup_discovery
Cleanup discovery
2015-01-22 11:53:29 -08:00
Victor Vieux a12c8ff87e add consul to usage
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-22 19:40:36 +00:00
Victor Vieux ecb47032bd fix panics in etcd and zookeeper + add tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-22 19:40:24 +00:00
Victor Vieux 29bbf0fb27 Merge pull request #270 from aluzzardi/loglevel
Replace --debug with --log-level
2015-01-21 17:45:22 -08:00
Andrea Luzzardi 8d3d71ba41 Re-add support for --debug.
If --debug is set (or $DEBUG) and no log level was specified, enforce
log-level=debug.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-21 17:38:54 -08:00
Andrea Luzzardi c2d527c9c6 Merge pull request #269 from vieux/add_stats
add docker stats support
2015-01-21 17:31:04 -08:00
Andrea Luzzardi 7dd2d2440b Merge pull request #271 from vieux/history_inspect
add support for history, inspect for images and improve inspect for containers
2015-01-21 17:26:50 -08:00
Victor Vieux 2e968d7800 add support for history, inspect for images and improve inspect for containers
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-22 00:49:02 +00:00
Andrea Luzzardi 5200e3e764 Replace --debug with --log-level
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-21 16:16:44 -08:00
Victor Vieux 027f8ed44a add docker rename support
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-21 23:51:36 +00:00
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 #268 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 #265 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 #263 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 #261 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 #258 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 #253
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 #228
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 #230 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 #249 from vieux/docker_images
Proposal: Simple docker images support
2015-01-19 14:06:47 -08:00