tormakris/cloudnet-compose
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
84 Commits 1 Branch 0 Tags 1,018 KiB
21781de893
Commit Graph

84 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mano Marks
21781de893 Merge pull request #57 from ggtools/patch-1 
Fix docker-compose-javawork.yml
 2017-01-20 15:12:37 -08:00
Mano Marks
8e798dec3a Merge pull request #60 from docker/duplicate_key 
note about one vote per client
 2017-01-20 14:08:50 -08:00
sophia parafina
67e2e0800f note about one vote per client 2017-01-20 15:58:22 -06:00
Mano Marks
006f294799 Merge pull request #58 from ManoMarks/stack 
Adding in docker-stack.yml
 2017-01-18 09:46:32 -08:00
Christophe Labouisse
81f18a27f6 Fix docker-compose-javawork.yml 
With docker-compose 1.10-rc1 build from this file was failing. Fix this by using the new build syntax with explicit `context` & `dockerfile`.
 2017-01-15 22:25:58 +01:00
Mano Marks
d53ab169ac adding placement restraint to add visualizer, must run on a manager 2017-01-13 18:15:26 -08:00
Mano Marks
a34564cb55 updating to use dockersamples/visualizer:stable instead of manomarks/visualizer 2017-01-10 18:29:36 -08:00
Mano Marks
0285545512 adding before tag to vote and result images 2017-01-10 17:57:43 -08:00
Mano Marks
fc316a130a adding a line where one was missing 2017-01-09 14:44:01 -08:00
Mano Marks
4743b464a6 changing docker-stack.yml to more closely match the rest of the app, and add a visualizer 2017-01-09 14:42:37 -08:00
Mano Marks
48bdf36336 adding docker-stack.yml 2017-01-09 14:23:30 -08:00
Mano Marks
0334f60f3e Merge pull request #56 from docker/revert-54-connection_pooling 
Revert "added connection pooling to postgres to prevent client timeouts"
 2016-12-27 10:08:09 -08:00
Mano Marks
9352ed09eb Revert "added connection pooling to postgres to prevent client timeouts" 2016-12-27 10:07:14 -08:00
Mano Marks
feacab96f6 Merge pull request #54 from spara/connection_pooling 
added connection pooling to postgres to prevent client timeouts
 2016-12-12 14:17:41 -08:00
sophia parafina
de9d6531ec added connection pooling to postgres to prevent client timeouts 2016-12-12 15:37:28 -06:00
Mano Marks
7d759f04ed Merge pull request #50 from ManoMarks/aanand-restore-java-worker 
Java and .NET Workers can co-exist
 2016-11-15 14:58:06 -08:00
Mano Marks
fe98cde7f4 Java and .NET Workers can co-exist 
Added a docker-compose-javaworker.yml file and Dockerfile.j as well as restoring the worker Java source so there are two different versions now.
 2016-11-15 14:56:00 -08:00
Mano Marks
be5173b11b Merge pull request #44 from ManoMarks/master 
updating .NET to current version 1.0.0 in Dockerfile and in code
 2016-11-15 12:10:48 -08:00
Ben Firshman
7f5e83565a Merge pull request #47 from docker/revert-45-resultapp 
Revert "Labels changes according to options"
 2016-11-10 12:49:15 -08:00
Ben Firshman
c0affbaeaf Revert "Labels changes according to options" 2016-11-10 20:48:25 +00:00
Mano Marks
af9f2fec68 Merge pull request #45 from mohan08p/resultapp 
Labels changes according to options
 2016-11-03 11:01:50 -07:00
Mohan Pawar
fba7358d8d Labels changes according to options 2016-11-03 05:46:52 +00:00
Mano Marks
d7fb287f61 updating .NET to current version 1.0.0 in Dockerfile and in code 2016-10-31 15:44:27 -07:00
Ben Firshman
fb981298cd Merge pull request #42 from bfirsh/add-mano-as-maintainer 
Add Mano as a maintainer
 2016-10-24 19:22:10 +02:00
Ben Firshman
1b30ff6880
Add Mano as a maintainer 
/cc @aanand @manomarks

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-10-20 10:25:10 +02:00
Ben Firshman
ed73c0c428 Merge pull request #40 from ManoMarks/master 
Adding additional compose file
 2016-10-19 07:57:29 +01:00
Mano Marks
51815474ff moved docker-compose.yml to docker-compose-simple.yml and restored older version of docker-compose.yml with networks and volumes 2016-10-11 16:24:49 -07:00
Ben Firshman
4065c3e61d Merge pull request #37 from docker/revert-36-master 
Revert "Updating Worker Dockerfile"
 2016-09-26 16:41:14 +01:00
Ben Firshman
66e2d1df2b Revert "Updating Worker Dockerfile" 2016-09-26 16:41:04 +01:00
Ben Firshman
a62d605e87 Merge pull request #36 from ManoMarks/master 
Updating Worker Dockerfile
 2016-09-23 10:56:05 +01:00
Mano Marks
5379644169 Updating Worker Dockerfile 
Changing base image to Microsoft's release version
 2016-09-22 13:25:11 -07:00
Ben Firshman
b2f740d13f Merge pull request #23 from h0tbird/amend_readme 
Replace Java with .NET
 2016-08-15 12:47:36 +01:00
Aanand Prasad
0d5cd2bd99 Reword connection retry messages 2016-06-30 13:38:31 -07:00
Aanand Prasad
500db05c54 Restore Java worker 2016-06-30 13:35:10 -07:00
Marc Villacorta
9bee7a15a0
Replace Java with .NET 2016-06-29 13:11:48 +02:00
Aanand Prasad
036c119e2c Reword connection retry messages 2016-06-19 21:32:18 -07:00
Aanand Prasad
82fd54e28f Update architecture diagram 2016-06-19 12:14:38 -07:00
Aanand Prasad
ffdd4940c6 Relax result test 2016-06-19 11:45:57 -07:00
Ben Firshman
d801ba9838 Merge pull request #22 from docker/fix-worker-race-condition 
Fix race condition in worker
 2016-06-18 23:19:40 +02:00
Aanand Prasad
c57e9c315a Fix race condition in worker 2016-06-18 14:16:49 -07:00
Ben Firshman
dea83e7ea8 Put gunicorn command in list 2016-06-18 10:56:26 -07:00
Ben Firshman
3a7eb3b4b0 Fix image names in dockercloud.yml 2016-06-18 10:49:05 -07:00
Ben Firshman
ade2b40403 Merge pull request #21 from bfirsh/rename-services 
Rename services to remove "app"
 2016-06-18 19:32:22 +02:00
Ben Firshman
09279e12a8 Rename services to remove "app" 2016-06-18 10:18:53 -07:00
Ben Firshman
dd03d8937a Use gunicorn for voting app in prod 2016-06-18 10:18:31 -07:00
Ben Firshman
1a0b0c8b54 Set redis socket timeout to 5s 2016-06-18 10:15:57 -07:00
Ben Firshman
4d5ce4862e Increase size of "processed by" text 2016-06-18 10:14:04 -07:00
Aanand Prasad
daaa19fa96 Architecture diagram 2016-06-18 10:12:34 -07:00
Ben Firshman
8e0440b843 Update readme 2016-06-18 10:12:27 -07:00
Ben Firshman
df96dfd638 Add Node debugging 
and simplify Compose file
 2016-06-18 10:04:44 -07:00