From 42bc99f1ffe5c851d7383e437e52d53dc65ee746 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Sat, 28 Oct 2017 12:05:51 +0200
Subject: Sync simulator with upstream

This change updates the simulator to the latest upstream version, which
adds prebuilding to the Docker image and limits to simulation time.

I have also added failure settings to the docker-compose configuration,
in addition to slimming down the opendc Docker image configuration.
---
 Dockerfile         | 13 +++++-----
 docker-compose.yml | 76 ++++++++++++++++++++++++++++++------------------------
 opendc-frontend    |  2 +-
 opendc-simulator   |  2 +-
 opendc-web-server  |  2 +-
 5 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index de243843..ff9f6085 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,10 @@
 FROM node:7.4
 MAINTAINER Sacheendra Talluri <sacheendra.t@gmail.com>
 
-# Installing python, yarn, and web-server dependencies
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-	&& echo "deb http://ftp.debian.org/debian stretch main" >> /etc/apt/sources.list \
+# Installing python and web-server dependencies
+RUN echo "deb http://ftp.debian.org/debian stretch main" >> /etc/apt/sources.list \
 	&& apt-get update \
-	&& apt-get install -y python python-pip yarn git sed supervisor openjdk-8-jdk mysql-client \
+	&& apt-get install -y python python-pip yarn git sed mysql-client \
 	&& pip install oauth2client eventlet flask-socketio flask-compress mysql-connector-python-rf \
 	&& rm -rf /var/lib/apt/lists/*
 
@@ -22,4 +20,7 @@ RUN chmod 555 /opendc/build/configure.sh \
 	&& export REACT_APP_OAUTH_CLIENT_ID=$(cat ../keys.json | python -c "import sys, json; print json.load(sys.stdin)['OAUTH_CLIENT_ID']") \
 	&& npm run build
 
-CMD ["sh", "-c", "cd /opendc && ./build/configure.sh && /usr/bin/supervisord -c /opendc/build/supervisord.conf"]
+# Set working directory
+WORKDIR /opendc
+
+CMD ["sh", "-c", "./build/configure.sh && python2.7 opendc-web-server/main.py keys.json"]
diff --git a/docker-compose.yml b/docker-compose.yml
index d1c9c1f7..ac4bc27f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,33 +1,43 @@
-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:
-      - PERSISTENCE_URL=jdbc:mysql://mariadb:3306/opendc
-      - PERSISTENCE_USER=opendc
-      - PERSISTENCE_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:
+  frontend:
+    build: ./
+    image: frontend
+    restart: on-failure
+    ports:
+      - "8081:8081"
+    links:
+      - mariadb
+    depends_on:
+      - mariadb
+    environment:
+      - MYSQL_DATABASE=opendc
+      - MYSQL_USER=opendc
+      - MYSQL_PASSWORD=opendcpassword
+  simulator:
+    build:
+        context: ./opendc-simulator
+        dockerfile: opendc-integration-jpa/mysql/Dockerfile
+    image: simulator
+    restart: on-failure
+    links:
+      - mariadb
+    depends_on:
+      - mariadb
+    environment:
+      - PERSISTENCE_URL=jdbc:mysql://mariadb:3306/opendc
+      - PERSISTENCE_USER=opendc
+      - PERSISTENCE_PASSWORD=opendcpassword
+  mariadb:
+    image: mariadb:10.1
+    restart: on-failure
+    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"
diff --git a/opendc-frontend b/opendc-frontend
index 194b0125..bcf119f2 160000
--- a/opendc-frontend
+++ b/opendc-frontend
@@ -1 +1 @@
-Subproject commit 194b0125d44ed960ba4d2e79bfc64633d92e1c29
+Subproject commit bcf119f2c4ac587cc8263db8a9fc0581521fdec7
diff --git a/opendc-simulator b/opendc-simulator
index 25cc35b0..8666a78b 160000
--- a/opendc-simulator
+++ b/opendc-simulator
@@ -1 +1 @@
-Subproject commit 25cc35b0e4942e990c01ac6224720e8fe84fd9ae
+Subproject commit 8666a78b86a40c1d8dab28dd18e841318c01f97f
diff --git a/opendc-web-server b/opendc-web-server
index cb4eafa8..b87faa0b 160000
--- a/opendc-web-server
+++ b/opendc-web-server
@@ -1 +1 @@
-Subproject commit cb4eafa88edd4db36f34185c9477e84346bece6e
+Subproject commit b87faa0bccf661a2b6a948d9420d52a19a63d9a2
-- 
cgit v1.2.3