diff options
| -rw-r--r-- | Dockerfile | 8 | ||||
| -rw-r--r-- | build/supervisord.conf | 9 | ||||
| m--------- | opendc-simulator | 36 |
3 files changed, 32 insertions, 21 deletions
@@ -6,7 +6,7 @@ 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 \ && apt-get update \ - && apt-get install -y python python-pip yarn git sqlite3 sed supervisor mysql-client \ + && apt-get install -y python python-pip yarn git sed supervisor openjdk-8-jdk mysql-client \ && pip install oauth2client eventlet flask-socketio mysql-connector-python-rf \ && rm -rf /var/lib/apt/lists/* @@ -15,11 +15,13 @@ COPY ./ /opendc # Setting up simulator RUN chmod 555 /opendc/build/configure.sh \ + && cd /opendc/opendc-simulator \ + && ./gradlew build \ && cd /opendc/opendc-frontend \ && rm -rf ./build \ && rm -rf ./node_modules \ - && yarn \ + && npm install \ && export REACT_APP_OAUTH_CLIENT_ID=$(cat ../keys.json | python -c "import sys, json; print json.load(sys.stdin)['OAUTH_CLIENT_ID']") \ - && yarn build + && npm run build CMD ["sh", "-c", "cd /opendc && ./build/configure.sh && /usr/bin/supervisord -c /opendc/build/supervisord.conf"] diff --git a/build/supervisord.conf b/build/supervisord.conf index 37b5cc16..ff4556a4 100644 --- a/build/supervisord.conf +++ b/build/supervisord.conf @@ -7,3 +7,12 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 + +[program:simulator] +directory=/opendc/opendc-simulator/opendc-integration-jpa +command=/opendc/opendc-simulator/gradlew run +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + diff --git a/opendc-simulator b/opendc-simulator -Subproject 504598b320c689cca3d1bbf523a4dd82f69d7a6 +Subproject 22547de46abf1e0ab517657e2727b0eeaddeeaa |