diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-09-28 16:42:36 +0200 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-09-28 16:42:36 +0200 |
| commit | a6fb43b576b94d6fd842f5c6dba443b39a5b3ac9 (patch) | |
| tree | 620347ed4d5293148b936670b128180ddf9b45bc /Dockerfile | |
| parent | ad5ba1f4df8ed96c7569c60a5e52bf566dfcee88 (diff) | |
Remove C++ simulator from docker setup
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 13 |
1 files changed, 2 insertions, 11 deletions
@@ -6,7 +6,6 @@ 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 -y -t stretch install gcc-6 g++-6 \ && apt-get install -y python python-pip yarn git sqlite3 sed supervisor mysql-client \ && pip install oauth2client eventlet flask-socketio mysql-connector-python-rf \ && rm -rf /var/lib/apt/lists/* @@ -15,13 +14,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ COPY ./ /opendc # Setting up simulator -RUN mkdir -p /data/database \ - && chmod 555 /opendc/build/configure.sh \ - && cd /opendc/opendc-simulator/Simulator \ - && rm -f ./simulator ./sqlite3.o \ - && make \ - && chmod 555 ./simulator \ - && git config --global url."https://".insteadOf git:// \ +RUN chmod 555 /opendc/build/configure.sh \ && cd /opendc/opendc-frontend \ && rm -rf ./build \ && rm -rf ./node_modules \ @@ -29,6 +22,4 @@ RUN mkdir -p /data/database \ && export REACT_APP_OAUTH_CLIENT_ID=$(cat ../keys.json | python -c "import sys, json; print json.load(sys.stdin)['OAUTH_CLIENT_ID']") \ && yarn build -CMD ["sh", "-c", "cd /opendc && ./build/configure.sh /data/database && /usr/bin/supervisord -c /opendc/build/supervisord.conf"] - -VOLUME ["/data/database"] +CMD ["sh", "-c", "cd /opendc && ./build/configure.sh && /usr/bin/supervisord -c /opendc/build/supervisord.conf"] |