Skip to content

Commit c60e376

Browse files
authored
Merge pull request dockersamples#61 from ManoMarks/master
updating compose files to v3
2 parents f6d60bf + 3c72629 commit c60e376

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

README.md

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
1-
Instavote
1+
Example Voting App
22
=========
33

44
Getting started
55
---------------
66

7-
Download [Docker for Mac or Windows](https://www.docker.com).
7+
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/).
88

99
Run in this directory:
10-
11-
$ docker-compose up
12-
10+
```
11+
docker-compose up
12+
```
1313
The app will be running at [http://localhost:5000](http://localhost:5000), and the results will be at [http://localhost:5001](http://localhost:5001).
1414

15+
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:
16+
```
17+
docker swarm init
18+
```
19+
Once you have your swarm, in this directory run:
20+
```
21+
docker stack deploy --compose-file docker-stack.yml vote
22+
```
23+
1524
Architecture
1625
-----
1726

docker-compose-javaworker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "2"
1+
version: "3"
22

33
services:
44
vote:

docker-compose-simple.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "2"
1+
version: "3"
22

33
services:
44
vote:

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "2"
1+
version: "3"
22

33
services:
44
vote:

0 commit comments

Comments
 (0)