Convert app to use Compose file 2

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

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:

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");
       }

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__)
 
 

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");