Merge pull request #61 from ManoMarks/master

updating compose files to v3

README.md

@@ -1,17 +1,26 @@
-Instavote
+Example Voting App
 =========
 
 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
 -----
 

docker-compose-javaworker.yml

@@ -1,4 +1,4 @@
-version: "2"
+version: "3"
 
 services:
   vote:

docker-compose-simple.yml

@@ -1,4 +1,4 @@
-version: "2"
+version: "3"
 
 services:
   vote:

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "2"
+version: "3"
 
 services:
   vote: