From 55c3c489c04bb002c6bd705f5dac5c580fb8f102 Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <g.andreadis@student.tudelft.nl>
Date: Fri, 29 Sep 2017 09:51:01 +0200
Subject: Connect docker-compose with new simulator image

---
 docker-compose.yml | 60 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 4b757efe..f1fa0ae7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,27 +1,33 @@
-version: "2"
-services:
-  opendc:
-    build: ./
-    image: opendc
-    ports:
-     - "8081:8081"
-    links:
-     - mariadb
-    depends_on:
-     - mariadb
-    environment:
-     - MYSQL_DATABASE=opendc
-     - MYSQL_USER=opendc
-     - MYSQL_PASSWORD=opendcpassword
-  mariadb:
-    image: mariadb:10.1
-    ports:
-     - "3306:3306" # comment this line out in production
-    environment:
-     - MYSQL_DATABASE=opendc
-     - MYSQL_USER=opendc
-     - MYSQL_PASSWORD=opendcpassword
-     - MYSQL_RANDOM_ROOT_PASSWORD=yes
-    # uncomment in production
-    # volumes:
-    #  - "/data/mariadb:/var/lib/mysql"
+version: "2"
+services:
+  opendc:
+    build: ./
+    image: opendc
+    ports:
+      - "8081:8081"
+    links:
+      - mariadb
+    depends_on:
+      - mariadb
+    environment:
+      - MYSQL_DATABASE=opendc
+      - MYSQL_USER=opendc
+      - MYSQL_PASSWORD=opendcpassword
+  opendc-simulator:
+    build: ./opendc-simulator
+    environment:
+      - MYSQL_DATABASE=opendc
+      - MYSQL_USER=opendc
+      - MYSQL_PASSWORD=opendcpassword
+  mariadb:
+    image: mariadb:10.1
+    ports:
+      - "3306:3306" # comment this line out in production
+    environment:
+      - MYSQL_DATABASE=opendc
+      - MYSQL_USER=opendc
+      - MYSQL_PASSWORD=opendcpassword
+      - MYSQL_RANDOM_ROOT_PASSWORD=yes
+    # uncomment in production
+    # volumes:
+    #   - "/data/mariadb:/var/lib/mysql"
-- 
cgit v1.2.3