From ddbe854650c018a8164093821f9c90300fb0867e Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Tue, 12 May 2020 09:07:13 +0200 Subject: Use Yarn and upgrade --- Dockerfile | 6 +++--- opendc-frontend | 2 +- opendc-web-server | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8a8323b6..94aac35a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER Sacheendra Talluri 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 index e65b805e..ebe34d0d 160000 --- a/opendc-frontend +++ b/opendc-frontend @@ -1 +1 @@ -Subproject commit e65b805e94052d993f7ef486226cae0ebf9965b5 +Subproject commit ebe34d0d2cf5f1967e067bf0e43505dd46025c57 diff --git a/opendc-web-server b/opendc-web-server index cd116ba5..a9ecf3c4 160000 --- a/opendc-web-server +++ b/opendc-web-server @@ -1 +1 @@ -Subproject commit cd116ba5063b9bfda029196b310207b45e21604a +Subproject commit a9ecf3c48c92d667201bb77e709e2527ee35f7c4 -- cgit v1.2.3