Use Yarn and upgrade

3 files changed, 13 insertions, 18 deletions

diff --git a/Dockerfile b/Dockerfile
index 8a8323b6..94aac35a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ 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 oauth2client eventlet flask-socketio flask-compress mysql-connector-python-rf flask-cors \
 	&& pip install --upgrade pyasn1-modules \
 	&& rm -rf /var/lib/apt/lists/*
 
@@ -17,9 +17,9 @@ RUN chmod 555 /opendc/build/configure.sh \
 	&& 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
 
 # Set working directory
 WORKDIR /opendc
diff --git a/opendc-frontend b/opendc-frontend
-Subproject e65b805e94052d993f7ef486226cae0ebf9965b
+Subproject ebe34d0d2cf5f1967e067bf0e43505dd46025c5
diff --git a/opendc-web-server b/opendc-web-server
-Subproject cd116ba5063b9bfda029196b310207b45e21604
+Subproject a9ecf3c48c92d667201bb77e709e2527ee35f7c