From 42bc99f1ffe5c851d7383e437e52d53dc65ee746 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek 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 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Dockerfile') 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 -# 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"] -- cgit v1.2.3