From 94c0d7b5076bb3ed21fc472b9341e32b8fee7662 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Mon, 25 Jan 2016 18:20:23 +0000
Subject: [PATCH] Convert app to use Compose file 2

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 README.md                                     |  4 +-
 vote-apps/docker-compose.yml                  | 53 +++++++++++--------
 vote-apps/result-app/server.js                |  2 +-
 vote-apps/voting-app/app.py                   |  2 +-
 .../worker/src/main/java/worker/Worker.java   |  4 +-
 5 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 7dc53ba..daf2763 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Example Voting App
 ==================
 
-This is an example Docker app with multiple services. It is run with Docker Compose and uses Docker Networking to connect containers together.
+This is an example Docker app with multiple services. It is run with Docker Compose and uses Docker Networking to connect containers together. You will need Docker Compose 1.6 or later.
 
 More info at https://blog.docker.com/2015/11/docker-toolbox-compose/
 
@@ -20,7 +20,7 @@ Running
 Since this app makes use of Compose's experimental networking support, it must be started with:
 
     $ cd vote-apps/
-    $ docker-compose --x-networking up -d
+    $ docker-compose up -d
 
 The app will be running on port 5000 on your Docker host, and the results will be on port 5001.
 
diff --git a/vote-apps/docker-compose.yml b/vote-apps/docker-compose.yml
index 4a14420..713df2d 100644
--- a/vote-apps/docker-compose.yml
+++ b/vote-apps/docker-compose.yml
@@ -1,25 +1,36 @@
-voting-app:
-  build: ./voting-app/.
-  volumes:
-    - ./voting-app:/app
-  ports:
-    - "5000:80"
+version: "2"
+services:
+  voting-app:
+    build: ./voting-app/.
+    volumes:
+      - ./voting-app:/app
+    ports:
+      - "5000:80"
+    links:
+      - redis
 
-redis:
-  image: redis
-  ports: ["6379"]
+  redis:
+    image: redis
+    ports: ["6379"]
 
-worker:
-  build: ./worker
+  worker:
+    build: ./worker
+    links:
+      - db
+      - redis
 
-db:
-  image: postgres:9.4
-  volumes:
-    - "myvolume:/var/lib/postgresql/data"
+  db:
+    image: postgres:9.4
+    volumes:
+      - "myvolume:/var/lib/postgresql/data"
 
-result-app:
-  build: ./result-app/.
-  volumes:
-    - ./result-app:/app
-  ports:
-    - "5001:80"
+  result-app:
+    build: ./result-app/.
+    volumes:
+      - ./result-app:/app
+    ports:
+      - "5001:80"
+    links:
+      - db
+volumes:
+  myvolume:
diff --git a/vote-apps/result-app/server.js b/vote-apps/result-app/server.js
index 30434e2..0675afe 100644
--- a/vote-apps/result-app/server.js
+++ b/vote-apps/result-app/server.js
@@ -24,7 +24,7 @@ io.sockets.on('connection', function (socket) {
 async.retry(
   {times: 1000, interval: 1000},
   function(callback) {
-    pg.connect('postgres://postgres@voteapps_db_1/postgres', function(err, client, done) {
+    pg.connect('postgres://postgres@db/postgres', function(err, client, done) {
       if (err) {
         console.error("Failed to connect to db");
       }
diff --git a/vote-apps/voting-app/app.py b/vote-apps/voting-app/app.py
index 67f576e..f811045 100644
--- a/vote-apps/voting-app/app.py
+++ b/vote-apps/voting-app/app.py
@@ -12,7 +12,7 @@ option_a = os.getenv('OPTION_A', "Cats")
 option_b = os.getenv('OPTION_B', "Dogs")
 hostname = socket.gethostname()
 
-redis = connect_to_redis("voteapps_redis_1")
+redis = connect_to_redis("redis")
 app = Flask(__name__)
 
 
diff --git a/vote-apps/worker/src/main/java/worker/Worker.java b/vote-apps/worker/src/main/java/worker/Worker.java
index ba2362c..66c6c0c 100644
--- a/vote-apps/worker/src/main/java/worker/Worker.java
+++ b/vote-apps/worker/src/main/java/worker/Worker.java
@@ -8,8 +8,8 @@ import org.json.JSONObject;
 class Worker {
   public static void main(String[] args) {
     try {
-      Jedis redis = connectToRedis("voteapps_redis_1");
-      Connection dbConn = connectToDB("voteapps_db_1");
+      Jedis redis = connectToRedis("redis");
+      Connection dbConn = connectToDB("db");
 
       System.err.println("Watching vote queue");