From a6fb43b576b94d6fd842f5c6dba443b39a5b3ac9 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Thu, 28 Sep 2017 16:42:36 +0200 Subject: Remove C++ simulator from docker setup --- Dockerfile | 13 ++----------- build/supervisord.conf | 7 ------- opendc-frontend | 2 +- opendc-web-server | 2 +- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index c2661855..b2461767 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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"] diff --git a/build/supervisord.conf b/build/supervisord.conf index 05ceede2..37b5cc16 100644 --- a/build/supervisord.conf +++ b/build/supervisord.conf @@ -7,10 +7,3 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 - -[program:simulator] -command=/bin/sh -c '/opendc/opendc-simulator/Simulator/simulator /data/database/opendc.db' -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/opendc-frontend b/opendc-frontend index 532aa9c9..6eda1481 160000 --- a/opendc-frontend +++ b/opendc-frontend @@ -1 +1 @@ -Subproject commit 532aa9c9241de0b658499ea4bb04e1b3b7035082 +Subproject commit 6eda14819b8c8a67b66eab9e04e82e141093f7da diff --git a/opendc-web-server b/opendc-web-server index 4c6d68dd..44f0bd37 160000 --- a/opendc-web-server +++ b/opendc-web-server @@ -1 +1 @@ -Subproject commit 4c6d68dd2e460095e20ba32007a35da4c5e6dae6 +Subproject commit 44f0bd378763f4c481fb8a87847ca84469b35a67 -- cgit v1.2.3