summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile9
m---------opendc-web-server24
2 files changed, 11 insertions, 22 deletions
diff --git a/Dockerfile b/Dockerfile
index be28805a..b9aecf60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,17 +3,20 @@ MAINTAINER Sacheendra Talluri <sacheendra.t@gmail.com>
# 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 apt-transport-https \
+# && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+# && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
&& apt-get update \
&& apt-get install -y python python-pip yarn git sed mysql-client \
- && pip install oauth2client eventlet flask-socketio flask-compress mysql-connector-python-rf \
- && pip install --upgrade pyasn1-modules \
&& rm -rf /var/lib/apt/lists/*
# Copy OpenDC directory
COPY ./ /opendc
# Setting up simulator
-RUN chmod 555 /opendc/build/configure.sh \
+RUN python /opendc/opendc-web-server/setup.py install \
+ && chmod 555 /opendc/build/configure.sh \
&& cd /opendc/opendc-frontend \
&& rm -rf ./build \
&& rm -rf ./node_modules \
diff --git a/opendc-web-server b/opendc-web-server
-Subproject 9a2a98548ab50217a78d433a13da72af3001a78
+Subproject 39a147b14d9ad079433d5405c7a3d533851095f