From 55c3c489c04bb002c6bd705f5dac5c580fb8f102 Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <g.andreadis@student.tudelft.nl>
Date: Fri, 29 Sep 2017 09:51:01 +0200
Subject: Connect docker-compose with new simulator image

---
 Dockerfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 12c2f4d2..49c82935 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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"]
-- 
cgit v1.2.3