Commit Graph

834 Commits

Author SHA1 Message Date
Andrea Luzzardi
06dfd16378 Merge pull request #302 from mota/remove-state
Remove the container's state from the store when destroyed
2015-01-26 13:45:56 -08:00
Pierre Wacrenier
eb48f4d2f0 Remove the container's state from the store when destroyed
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
2015-01-26 22:34:47 +01:00
Andrea Luzzardi
fabe77bdde Merge pull request #283 from chanwit/cleanup-zk-path
Cleanup: implement full path creation for zookeeper
2015-01-26 11:52:22 -08:00
Andrea Luzzardi
e7aba669dd Merge pull request #300 from vieux/match_only_name_image
match only repo in affinity image
2015-01-26 11:44:45 -08:00
Victor Vieux
82ffe8c7c1 Merge branch 'ankushagarwal-token/Fetch' 2015-01-26 19:27:37 +00:00
Victor Vieux
3c595e96e2 cleanup
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-26 19:27:25 +00:00
Ankush Agarwal
b3bcab711e Add error message when discovery service returns non 200
status code. Update doc for token.go/Fetch

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-01-26 00:18:11 -08:00
Victor Vieux
6af7c3c209 match only repo
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-24 21:27:03 -08:00
Victor Vieux
9d5fe6949e Merge pull request #297 from mota/fix-tests
fix tests that were not compiling or panicking
2015-01-24 21:18:10 -08:00
Pierre Wacrenier
fc58587315 fix tests that were not compiling or panicking
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
2015-01-25 01:42:49 +01:00
Victor Vieux
4ae79a8ff7 update for dockerclient
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-24 11:14:38 -08:00
Victor Vieux
8e2cbf5627 Merge pull request #282 from radeksimko/variable-app-name
Use actual binary name instead of hardcoding it
2015-01-24 10:57:43 -08:00
Chanwit Kaewkasi
56177ef963 cleanup to support fullpath creation for zookeeper
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-24 16:41:52 +07:00
Radek Simko
a1f4e44f09 Use actual binary name instead of hardcoding it
Signed-off-by: Radek Simko <radek.simko@gmail.com>
2015-01-24 08:27:36 +00:00
Victor Vieux
fd05c738c2 Merge pull request #292 from vieux/fix_panic_port
Fixes panic when ports are not specified
2015-01-23 18:20:45 -08:00
Victor Vieux
13b96828f2 update tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-24 01:58:51 +00:00
Victor Vieux
693fb0fcf1 fix panic with no port
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-24 01:42:35 +00:00
Victor Vieux
02cc59840f Revert "Fixes panic when ports are not specified"
This reverts commit a916f9cde0.

Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-24 01:42:15 +00:00
Andrea Luzzardi
d7e651f6ff Merge pull request #289 from docker/stefanfoulis
correct typos in filter readme
2015-01-23 17:02:48 -08:00
Victor Vieux
3d8aed071e correct typos in filter readme
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-24 00:43:25 +00:00
Victor Vieux
5ba0b09256 Merge pull request #286 from cpuguy83/fix_panic_on_bad_node_config
Fixes panic when ports are not specified
2015-01-23 13:11:10 -08:00
Brian Goff
a916f9cde0 Fixes panic when ports are not specified
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-23 15:56:14 -05:00
Victor Vieux
2f9ee816b7 Merge pull request #287 from vieux/hostname_manage
support hostname without nodes://
2015-01-23 10:46:58 -08:00
Victor Vieux
1581dcff6c support hostname without nodes://
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-23 10:42:20 -08:00
Victor Vieux
cb0baf349e Merge pull request #278 from aluzzardi/flags-homedir-cleanup
flags: Cleanup the homepath() function.
2015-01-22 15:08:58 -08:00
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