Commit Graph

851 Commits

Author SHA1 Message Date
Victor Vieux
cdf884cd10 Merge pull request #310 from aluzzardi/random-port-detection
Port filter: Random port assignment conflict detection.
2015-01-27 12:29:36 -08:00
Victor Vieux
abf5d40aeb Merge branch 'Ranjandas-Ranjandas-patch-1' 2015-01-27 12:28:34 -08:00
Ranjandas
3f19ac8c5a Updated Readme.md to include git client
`go get ` command requires git client to be present in the system to work, so added the instruction to get git installed with golang package.

Signed-off-by: Ranjandas <thejranjan@gmail.com>
2015-01-27 12:25:50 -08:00
Andrea Luzzardi
ec7d343a88 Merge pull request #306 from vieux/improve_logs1
improve some logs
2015-01-27 12:23:31 -08:00
Victor Vieux
cd56c0afcc Merge pull request #312 from chanwit/quick-fix-zk
Cleanup: fix fatal error when registering node
2015-01-27 12:22:24 -08:00
Victor Vieux
aad324a7a1 Merge pull request #314 from aluzzardi/store-remove-container-fix
Do not fail when destroying a container if it's not found in the store.
2015-01-27 12:21:25 -08:00
Andrea Luzzardi
9ed597b5eb Do not fail when destroying a container if it's not found in the store.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-27 12:13:58 -08:00
Chanwit Kaewkasi
f5d3efa53e fix fatal error when registering node
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-27 15:32:28 +07:00
Victor Vieux
b99bcb0ee1 Merge pull request #309 from aluzzardi/tls-flags-fix
Abort if --tlscert, --tlskey or --tlscacert are used without --tls.
2015-01-26 17:46:39 -08:00
Andrea Luzzardi
faa519905e Port filter: Random port assignment conflict detection.
This change takes into account ports that have been randomly allocated
on the node.

When starting containers with no explicit external port (e.g. `-p 80`),
Docker allocates a random port on the node.

The problem is that Swarm didn't see that random port as taken, meaning
that another container could explicitely ask for it, resulting in a
broken container.

Replaces #274
Fixes #272

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-26 17:29:20 -08:00
Andrea Luzzardi
8c2373a633 Abort if --tlscert, --tlskey or --tlscacert are used without --tls.
Fixes #296

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-26 17:14:43 -08:00
Victor Vieux
231ded20e0 improve some logs
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-26 23:41:56 +00:00
Victor Vieux
77a9d77166 Merge pull request #303 from aluzzardi/container-refresh
Improve container state refresh.
2015-01-26 14:50:51 -08:00
Victor Vieux
ffe280062d Merge pull request #305 from aluzzardi/tls-flags-check
Abort if dependent TLS flags are not passed.
2015-01-26 14:10:31 -08:00
Andrea Luzzardi
dc43a156bd Fix concurrency issue in node.updateContainer.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-26 14:04:41 -08:00
Andrea Luzzardi
6cc7dacae2 Abort if dependent TLS flags are not passed.
Fixes #296

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-26 13:55:25 -08:00
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
Andrea Luzzardi
cafbc6df28 Improve container state refresh.
Currently, container inspection is performed only on creation (or during
exec by the API).

The problem is that certain informations such as NetworkSettings are not
available during creation, therefore we must inspect the containers
during other events.

This change refactors a bit the API so that RefreshContainer() and
RefreshContainers() now accept a `full` flag to force a deep refresh.

The node event handler in turn uses that flag whenever a container
starts or dies.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-26 13:39:52 -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