From e82db4dcf6459c6a611da25c9439987d3f8cf06e Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 29 Apr 2020 17:04:35 +0200 Subject: [PATCH] add CI env variable to avoid react-script exiting --- docker-compose-ci.yml | 7 ++++--- fittrackee_client/Dockerfile | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 81cfa5b5..b51b1ce9 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -4,7 +4,7 @@ services: fittrackee-db: container_name: fittrackee-db - build: https://github.com/SamR1/mpwo.git#${BRANCH}:fittrackee_api/db + build: https://github.com/SamR1/FitTrackee.git#${BRANCH}:fittrackee_api/db ports: - 5435:5432 environment: @@ -13,7 +13,7 @@ services: fittrackee-api: container_name: fittrackee-api - build: https://github.com/SamR1/mpwo.git#${BRANCH}:fittrackee_api + build: https://github.com/SamR1/FitTrackee.git#${BRANCH}:fittrackee_api ports: - 5001:5000 environment: @@ -30,11 +30,12 @@ services: fittrackee-client: container_name: fittrackee-client build: - context: https://github.com/SamR1/mpwo.git#${BRANCH} + context: https://github.com/SamR1/FitTrackee.git#${BRANCH} dockerfile: ./fittrackee_client/Dockerfile args: - NODE_ENV=development - REACT_APP_API_URL=${REACT_APP_API_URL} + - CI=true ports: - 3007:3000 depends_on: diff --git a/fittrackee_client/Dockerfile b/fittrackee_client/Dockerfile index b381b2e6..15e9515c 100644 --- a/fittrackee_client/Dockerfile +++ b/fittrackee_client/Dockerfile @@ -13,9 +13,11 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH ARG REACT_APP_API_URL ARG NODE_ENV ARG REACT_APP_ALLOW_REGISTRATION +ARG CI ENV NODE_ENV $NODE_ENV ENV REACT_APP_API_URL $REACT_APP_API_URL ENV REACT_APP_ALLOW_REGISTRATION $REACT_APP_ALLOW_REGISTRATION +ENV CI $CI # install and cache app dependencies COPY package.json /usr/src/app/package.json