From f5866292e4c72efae0bc8e16aad6c39d81aaf165 Mon Sep 17 00:00:00 2001
From: GotPPay <bilal.catic@hotmail.com>
Date: Tue, 12 Jun 2018 08:30:02 +0200
Subject: [PATCH] fix ENV variables, apply ENV in frontend config

---
 client-wiaas/src/config.js |  6 +++---
 php.dockerfile             | 14 +++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/client-wiaas/src/config.js b/client-wiaas/src/config.js
index c3805e5..4f77ab5 100644
--- a/client-wiaas/src/config.js
+++ b/client-wiaas/src/config.js
@@ -6,14 +6,14 @@ const API_VERSION = 'v2';
 
 const API_SERVER_BASE = (() => {
     if(APPLICAITON_MODE === 'TEST'){
-        return process.env.TEST_URL;
+        return process.env.REACT_APP_TEST_URL;
     }
 
     if(APPLICAITON_MODE === 'PROD'){
-        return process.env.PROD_URL;
+        return process.env.REACT_APP_PROD_URL;
     }
 
-    return 'http://localhost:8000';
+    return process.env.REACT_APP_DEV_URL;
 })();
 
 const API_SERVER = API_SERVER_BASE + '/' + API_VERSION;
diff --git a/php.dockerfile b/php.dockerfile
index cc1de7e..9385237 100644
--- a/php.dockerfile
+++ b/php.dockerfile
@@ -1,10 +1,10 @@
 FROM php:7.0-apache
 
-ENV TEST_URL=http://localhost:8000/api-wiaas \
-    PROD_URL=http://localhost:8000/api-wiaas \
-    DEV_URL=http://localhost:8000/api-wiaas
+ENV REACT_APP_TEST_URL=http://localhost:8000/api-wiaas \
+    REACT_APP_PROD_URL=http://localhost:8000/api-wiaas \
+    REACT_APP_DEV_URL=http://localhost:8000/api-wiaas
 
-RUN apt-get update && apt-get install -y git && apt-get install -y unzip
+RUN apt-get update && apt-get install -y git unzip gnupg
 
 COPY docker/php/apache2.conf /etc/apache2/
 COPY docker/php/composer.phar /usr/local/bin/composer
@@ -20,16 +20,12 @@ RUN composer install
 WORKDIR /home/wiaas
 RUN cp -r api-wiaas /var/www/html/
 
-RUN apt-get update
-RUN apt-get upgrade -y
-
-RUN apt-get install -y gnupg
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
 RUN apt-get install -y nodejs
 
 WORKDIR /home/wiaas/client-wiaas
 RUN npm rebuild node-sass --force
-RUN npm install && npm run build
+RUN npm install && npm run build 
 RUN cp -r build/* /var/www/html/
 
 RUN docker-php-ext-install pdo pdo_mysql mysqli