a2203a92a5
Dockerfile: Statically compile the swarm binary.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-30 17:41:53 -08:00
b5cef2f19f
Merge pull request #329 from aluzzardi/travis-test
...
Simplify travis configuration.
2015-01-30 17:24:19 -08:00
682633a7ef
Merge pull request #330 from psftw/tweaks
...
Tweak Dockerfile for official image.
2015-01-30 17:19:07 -08:00
c88039f619
Tweak Dockerfile for official image.
...
Replaced ADD with COPY per best practices article. Removed unnecessary
Godeps install, and added a .dockerignore to shave off ~23M.
Signed-off-by: Peter Salvatore <peter@psftw.com>
2015-01-30 19:58:14 -05:00
405494df65
Merge pull request #338 from vieux/error_empty_token
...
error when token is empty
2015-01-30 15:18:54 -08:00
29bfee02fe
error when token is empty
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-30 22:42:18 +00:00
ead7c278bd
Simplify travis file.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-28 19:04:25 -08:00
78d86ac38a
Merge pull request #327 from aluzzardi/vieux-fix_match
...
Fix affinity matching.
2015-01-28 15:50:46 -08:00
51e89bc928
constraint filter: Simplify code.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-28 15:35:40 -08:00
e9130cac52
Merge pull request #320 from aluzzardi/godep-dockerfile
...
Dockerfile: Build swarm with vendored dependencies.
2015-01-28 15:11:08 -08:00
30a5f64893
Merge pull request #328 from aluzzardi/fix-panic-eventhandler
...
Fix a panic that occurs in the log handler when pulling images.
2015-01-28 14:54:59 -08:00
269cbb0cf4
exec bit on shell files.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-28 13:26:34 -08:00
acd036365d
Fix a panic that occurs in the log handler when pulling images.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-28 12:29:41 -08:00
df4ffb5a7b
affinity: Ensure affinities can be chained.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-28 12:16:23 -08:00
04fc1ab997
expr: Get rid of MatchEmpty.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-28 12:12:09 -08:00
fc192b7077
affinity: Fix expression matching by passing arguments in bulk.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-28 12:07:20 -08:00
5627b390df
filter expr: Test that the order in Match doesn't matter.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-28 12:07:20 -08:00
2f1a9b21b6
fix match
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-28 12:07:20 -08:00
de67d96532
Dockerfile: Build swarm with vendored dependencies.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-27 18:32:07 -08:00
86a028d7c1
Merge pull request #317 from aluzzardi/godep
...
Vendoring dependencies with godep.
2015-01-27 18:08:34 -08:00
bacf1ee849
Vendoring: Freeze dependencies.
...
Generated by: godep save ./...
Fixes #264
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-27 18:06:15 -08:00
ae3b1cfac9
travis: Restore dependencies using godep.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-27 18:06:13 -08:00
23302fca3e
travis: Exclude Godeps from gofmt validation.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-27 17:16:46 -08:00
45c1efd2c5
Merge pull request #318 from vieux/fix_status_code
...
add missing status codes
2015-01-27 14:37:09 -08:00
ad8f7facf7
add missing status codes
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-27 14:28:54 -08:00
0c446154d4
Merge pull request #315 from aluzzardi/redmon-demo-affinity
...
Add affinity to the redmon demo.
2015-01-27 12:38:14 -08:00
3d4a2f4ff4
Add affinity to the redmon demo.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-27 12:37:44 -08:00
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
abf5d40aeb
Merge branch 'Ranjandas-Ranjandas-patch-1'
2015-01-27 12:28:34 -08:00
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
ec7d343a88
Merge pull request #306 from vieux/improve_logs1
...
improve some logs
2015-01-27 12:23:31 -08:00
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
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
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
f5d3efa53e
fix fatal error when registering node
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-01-27 15:32:28 +07:00
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
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
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
231ded20e0
improve some logs
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-26 23:41:56 +00:00
77a9d77166
Merge pull request #303 from aluzzardi/container-refresh
...
Improve container state refresh.
2015-01-26 14:50:51 -08:00
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
dc43a156bd
Fix concurrency issue in node.updateContainer.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-26 14:04:41 -08:00
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
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
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
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
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
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
82ffe8c7c1
Merge branch 'ankushagarwal-token/Fetch'
2015-01-26 19:27:37 +00:00
3c595e96e2
cleanup
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-26 19:27:25 +00:00
Andrea Luzzardi