diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-09-29 09:51:01 +0200 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-09-29 09:51:01 +0200 |
| commit | 55c3c489c04bb002c6bd705f5dac5c580fb8f102 (patch) | |
| tree | 507a8f758d016259f71d5b3d5e7643dfdb97ef57 /Dockerfile | |
| parent | 2cdfdbe7d5ae097fa701ac34cd9e9720ee2dec3f (diff) | |
Connect docker-compose with new simulator image
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -15,13 +15,11 @@ COPY ./ /opendc # Setting up simulator RUN chmod 555 /opendc/build/configure.sh \ - && cd /opendc/opendc-simulator \ - && ./gradlew build \ && cd /opendc/opendc-frontend \ && rm -rf ./build \ && rm -rf ./node_modules \ - && npm install \ + && yarn \ && 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 + && yarn build CMD ["sh", "-c", "cd /opendc && ./build/configure.sh && /usr/bin/supervisord -c /opendc/build/supervisord.conf"] |