From 4c5f91eea6ce76599ef76ee645744b9547a0958d Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 28 Sep 2017 18:03:25 +0200 Subject: Add Kotlin simulator Docker configuration This change adds the Docker configuration for the Kotlin simulator to the repository. --- Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index b2461767..12c2f4d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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"] -- cgit v1.2.3