summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorGeorgios Andreadis <G.Andreadis@student.tudelft.nl>2017-10-28 13:17:15 +0200
committerGitHub <noreply@github.com>2017-10-28 13:17:15 +0200
commit7b5437b800f1996471d993699ed2a8d2eb4f53f8 (patch)
treeaf835b4b3e8a18c27b9e79ab4ac0c291753398ef /Dockerfile
parentb142b8017028bba8c59e573390dae19ab1ff328f (diff)
parent42bc99f1ffe5c851d7383e437e52d53dc65ee746 (diff)
Merge pull request #12 from atlarge-research/chore/sync-simulator
Sync simulator with upstream
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile13
1 files changed, 7 insertions, 6 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"]