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

58 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ben Firshman
64839f70dc Merge pull request #19 from bfirsh/vote-refactoring 
Various pieces of vote refactoring
 2016-06-18 18:29:45 +02:00
Ben Firshman
c6a5cc9b1c Merge pull request #20 from bfirsh/add-ci-test-for-docker-cloud 
Docker Cloud stack file and CI tests
 2016-06-18 18:29:31 +02:00
Borja Burgos
2d3fe7d299 fixing bug in dockercloud.yml 
lb was linking to the wrong service (web instead of voting-app)
 2016-06-17 20:53:42 -07:00
Borja Burgos
9eccee1ac2 adding dockercloud.yml 2016-06-17 20:52:38 -07:00
Borja Burgos
874a4bc79a adding CI test for Docker Cloud 2016-06-17 20:52:33 -07:00
Aanand Prasad
aa05c12ab7 Always show total vote count 2016-06-17 19:50:54 -07:00
Aanand Prasad
4b62828661 Extract vote collection function 2016-06-17 19:50:49 -07:00
Aanand Prasad
1f1a6f97a2 Fix percentage recalculation when both votes are zero 2016-06-17 19:50:42 -07:00
Ben Firshman
34acff585a Run flask server multithreaded 2016-06-17 15:24:14 -07:00
Ben Firshman
f029fcccc2 Merge pull request #18 from natemcmaster/dotnet 
Implement worker as a .NET Core app
 2016-06-13 02:22:20 +01:00
Nate McMaster
e5489683c8
Recreate worker as a .NET Core app 2016-06-11 14:26:04 -07:00
Ben Firshman
6562cee08c Merge pull request #16 from bfirsh/lazily-connect-to-redis 
Lazily connect to Redis in voting app
 2016-06-10 19:31:18 +01:00
Ben Firshman
5ce97c05fe Lazily connect to Redis in voting app 
Allows voting app to boot up without anything else.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-06-09 18:03:55 -07:00
Ben Firshman
e7b46707bd Merge pull request #15 from bfirsh/add-gitignore-remove-pyc 
Add gitignore remove pyc
 2016-06-03 23:46:53 +01:00
Ben Firshman
4cce340ca6 Add .gitignore to ignore future *.pyc 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-06-03 15:45:04 -07:00
Ben Firshman
702958b0d8 Remove .pyc file 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-06-03 15:44:49 -07:00
Ben Firshman
45f53434db Merge pull request #14 from ManoMarks/master 
Porting to Alpine images
 2016-05-04 13:01:41 +01:00
Mano Marks
3978756bb2 Moving result app to be based on node:5.11.0-slim, adding back links in docker-compose.yml, and removing explicit container names 2016-05-03 19:35:26 -07:00
Mano Marks
be0e4e2ff2 fixing app.py 2016-04-25 12:04:59 -07:00
Mano Marks
261eb03102 adding in improvements from when we ran the birthday party app. Mostly fixed the Dockerfiles so they use Alpine for the base images. That required re-working the Java worker Docker file. Removed links from compose file. cleaned up a few things like a tab instead of a space in app.py 2016-04-25 11:28:21 -07:00
Ben Firshman
10a3a3b68a Merge pull request #12 from bfirsh/add-license-maintainers 
Add LICENSE and MAINTAINERS
 2016-04-01 18:46:05 +01:00
Ben Firshman
e41af6b81c Add LICENSE and MAINTAINERS 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-03-31 11:49:23 -07:00
Ben Firshman
7629961971 Merge pull request #5 from bfirsh/readme-fixes 
Readme fixes
 2016-02-04 20:27:19 +00:00
Ben Firshman
0d19451246 Fix typo in image name 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-02-04 12:26:42 -08:00
Ben Firshman
b9dc5990fa Remove -d from Compose command 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-02-04 12:26:23 -08:00
Ben Firshman
6aa86f6a12 Merge pull request #3 from bfirsh/compose-file-2 
Convert app to use Compose file 2
 2016-02-04 19:57:27 +00:00