From 1d7bae103b4540ea4dbedc520dc6d810efe951bd Mon Sep 17 00:00:00 2001 From: Mano Marks Date: Mon, 23 Jan 2017 17:44:16 -0800 Subject: [PATCH 1/3] updating compose files to v3 --- docker-compose-javaworker.yml | 2 +- docker-compose-simple.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-javaworker.yml b/docker-compose-javaworker.yml index a35458b..df9f117 100644 --- a/docker-compose-javaworker.yml +++ b/docker-compose-javaworker.yml @@ -1,4 +1,4 @@ -version: "2" +version: "3" services: vote: diff --git a/docker-compose-simple.yml b/docker-compose-simple.yml index 289b9d2..aef4b75 100644 --- a/docker-compose-simple.yml +++ b/docker-compose-simple.yml @@ -1,4 +1,4 @@ -version: "2" +version: "3" services: vote: diff --git a/docker-compose.yml b/docker-compose.yml index efc3e6f..c5460ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "2" +version: "3" services: vote: From 88d606ed5851b08e15f102b19a39d291b5c708c9 Mon Sep 17 00:00:00 2001 From: Mano Marks Date: Tue, 24 Jan 2017 12:47:35 -0800 Subject: [PATCH 2/3] Updating README to include stack deploy instructions --- README.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0878b7d..6f062ee 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,23 @@ Instavote Getting started --------------- -Download [Docker for Mac or Windows](https://www.docker.com). +Download [Docker](https://www.docker.com/products/overview). If you are on Mac or Windows, [Docker Compose](https://docs.docker.com/compose) will be automatically installed. On Linux, make sure you have the latest version of [Compose](https://docs.docker.com/compose/install/). Run in this directory: - - $ docker-compose up - +``` +docker-compose up +``` The app will be running at [http://localhost:5000](http://localhost:5000), and the results will be at [http://localhost:5001](http://localhost:5001). +Alternately, if you want to run it on a [Docker Swarm](https://docs.docker.com/engine/swarm/), first make sure you have a Swarm. If you don't, run: +``` +docker swarm init +``` +Once you have your swarm, in this directory run: +``` +docker stack deploy --compose-file docker-stack.yml vote +``` + Architecture ----- From a01d01da6307dbf05f374ed4fb7ed15164576718 Mon Sep 17 00:00:00 2001 From: Mano Marks Date: Tue, 24 Jan 2017 12:48:36 -0800 Subject: [PATCH 3/3] Updating title of app --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6f062ee..a95f13f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Instavote +Example Voting App ========= Getting started @@ -12,7 +12,7 @@ docker-compose up ``` The app will be running at [http://localhost:5000](http://localhost:5000), and the results will be at [http://localhost:5001](http://localhost:5001). -Alternately, if you want to run it on a [Docker Swarm](https://docs.docker.com/engine/swarm/), first make sure you have a Swarm. If you don't, run: +Alternately, if you want to run it on a [Docker Swarm](https://docs.docker.com/engine/swarm/), first make sure you have a swarm. If you don't, run: ``` docker swarm init ```