Mano Marks
|
48bdf36336
|
adding docker-stack.yml
|
2017-01-09 14:23:30 -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 |
|
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 |
|