fix ENV variables, apply ENV in frontend config

This commit is contained in:
GotPPay
2018-06-12 08:30:02 +02:00
parent f3cc013344
commit f5866292e4
2 changed files with 8 additions and 12 deletions

View File

@@ -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