summaryrefslogtreecommitdiff
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-09-29 09:51:01 +0200
committerGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-09-29 09:51:01 +0200
commit55c3c489c04bb002c6bd705f5dac5c580fb8f102 (patch)
tree507a8f758d016259f71d5b3d5e7643dfdb97ef57 /docker-compose.yml
parent2cdfdbe7d5ae097fa701ac34cd9e9720ee2dec3f (diff)
Connect docker-compose with new simulator image
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml60
1 files changed, 33 insertions, 27 deletions
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"