use ENV variables instead of hardcoded values
This commit is contained in:
10
.env
Normal file
10
.env
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
MYSQL_ROOT_PASSWORD=root
|
||||||
|
MYSQL_DATABASE=wordpress
|
||||||
|
MYSQL_USER=wp_admin
|
||||||
|
MYSQL_PASSWORD=wp_password
|
||||||
|
|
||||||
|
API_URL=http://localhost:8081
|
||||||
|
|
||||||
|
REACT_APP_TEST_URL=http://localhost:8000/api-wiaas
|
||||||
|
REACT_APP_PROD_URL=http://localhost:8000/api-wiaas
|
||||||
|
REACT_APP_DEV_URL=${API_URL}
|
||||||
@@ -6,6 +6,6 @@ RUN a2enmod rewrite
|
|||||||
COPY docker/php/apache2.conf /etc/apache2/
|
COPY docker/php/apache2.conf /etc/apache2/
|
||||||
|
|
||||||
COPY backend /var/www/html
|
COPY backend /var/www/html
|
||||||
COPY docker/php/htaccess /var/www/.htaccess
|
COPY docker/php/.htaccess /var/www/html/
|
||||||
|
|
||||||
RUN chown -R www-data:www-data /var/www/html
|
RUN chown -R www-data:www-data /var/www/html
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -19,6 +19,10 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: frontend.dockerfile
|
dockerfile: frontend.dockerfile
|
||||||
|
args:
|
||||||
|
- REACT_APP_TEST_URL
|
||||||
|
- REACT_APP_PROD_URL
|
||||||
|
- REACT_APP_DEV_URL
|
||||||
volumes:
|
volumes:
|
||||||
- ./log/frontend/:/var/log/apache2/
|
- ./log/frontend/:/var/log/apache2/
|
||||||
ports:
|
ports:
|
||||||
@@ -28,5 +32,11 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: mysql.dockerfile
|
dockerfile: mysql.dockerfile
|
||||||
|
args:
|
||||||
|
- API_URL
|
||||||
|
- MYSQL_ROOT_PASSWORD
|
||||||
|
- MYSQL_DATABASE
|
||||||
|
- MYSQL_USER
|
||||||
|
- MYSQL_PASSWORD
|
||||||
ports:
|
ports:
|
||||||
- '23306:3306'
|
- '23306:3306'
|
||||||
|
|||||||
10
docker/envrionment.env
Normal file
10
docker/envrionment.env
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
MYSQL_ROOT_PASSWORD=root
|
||||||
|
MYSQL_DATABASE=wordpress
|
||||||
|
MYSQL_USER=wp_admin
|
||||||
|
MYSQL_PASSWORD=wp_password
|
||||||
|
|
||||||
|
API_URL=http://localhost:8081
|
||||||
|
|
||||||
|
REACT_APP_TEST_URL=http://localhost:8000/api-wiaas
|
||||||
|
REACT_APP_PROD_URL=http://localhost:8000/api-wiaas
|
||||||
|
REACT_APP_DEV_URL=${API_URL}
|
||||||
@@ -1,8 +1,12 @@
|
|||||||
FROM php:7.0-apache
|
FROM php:7.0-apache
|
||||||
|
|
||||||
ENV REACT_APP_TEST_URL=http://localhost:8000/api-wiaas \
|
ARG REACT_APP_TEST_URL
|
||||||
REACT_APP_PROD_URL=http://localhost:8000/api-wiaas \
|
ARG REACT_APP_PROD_URL
|
||||||
REACT_APP_DEV_URL=http://next.wiaas.saburly.com/api
|
ARG REACT_APP_DEV_URL
|
||||||
|
|
||||||
|
ENV REACT_APP_TEST_URL ${REACT_APP_TEST_URL}
|
||||||
|
ENV REACT_APP_PROD_URL ${REACT_APP_PROD_URL}}
|
||||||
|
ENV REACT_APP_DEV_URL ${REACT_APP_DEV_URL}
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y git unzip gnupg
|
RUN apt-get update && apt-get install -y git unzip gnupg
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
|
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
|
||||||
|
|||||||
@@ -1,8 +1,19 @@
|
|||||||
FROM mysql:5.7
|
FROM mysql:5.7
|
||||||
|
|
||||||
ENV MYSQL_ROOT_PASSWORD=root \
|
ARG API_URL
|
||||||
MYSQL_DATABASE=wordpress \
|
|
||||||
MYSQL_USER=wp_admin \
|
|
||||||
MYSQL_PASSWORD=wp_password
|
|
||||||
|
|
||||||
ADD database/clean-dump.sql /docker-entrypoint-initdb.d/dump.sql
|
ARG MYSQL_ROOT_PASSWORD
|
||||||
|
ARG MYSQL_DATABASE
|
||||||
|
ARG MYSQL_USER
|
||||||
|
ARG MYSQL_PASSWORD
|
||||||
|
|
||||||
|
ENV API_URL ${API_URL}
|
||||||
|
|
||||||
|
ENV MYSQL_ROOT_PASSWORD ${MYSQL_ROOT_PASSWORD}
|
||||||
|
ENV MYSQL_DATABASE ${MYSQL_DATABASE}
|
||||||
|
ENV MYSQL_USER ${MYSQL_USER}
|
||||||
|
ENV MYSQL_PASSWORD ${MYSQL_PASSWORD}
|
||||||
|
|
||||||
|
|
||||||
|
ADD database/clean-dump.sql /home/dump.sql
|
||||||
|
RUN sed -i -e 's@API_URL_PLACEHOLDER@'$API_URL'@g' /home/dump.sql && cp /home/dump.sql /docker-entrypoint-initdb.d
|
||||||
Reference in New Issue
Block a user