diff options
| author | Georgios Andreadis <G.Andreadis@student.tudelft.nl> | 2018-11-09 21:24:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-09 21:24:34 +0100 |
| commit | ad058270af5e27e32c91552bea4dfcd7ec7821a5 (patch) | |
| tree | e7cce641ce45988ed151f93c29876f6562dd0b1d | |
| parent | 40dbfb2d0d341027a3a316fd13d6a8dd7e2e460d (diff) | |
| parent | 6572a07a3a639917dba8a88cebacd8b77111ee91 (diff) | |
Merge pull request #16 from atlarge-research/use-setup-in-dockerfile
Use setup.py in web-server Docker install
| -rw-r--r-- | Dockerfile | 5 | ||||
| m--------- | opendc-web-server | 24 |
2 files changed, 7 insertions, 22 deletions
@@ -5,15 +5,14 @@ MAINTAINER Sacheendra Talluri <sacheendra.t@gmail.com> 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 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 |