environment fix

backend.dockerfile

@@ -1,5 +1,6 @@
 FROM php:7.0-apache
 
+<<<<<<< HEAD
 ARG API_URL
 
 ARG MYSQL_DATABASE
@@ -45,6 +46,17 @@ RUN chmod +x /usr/local/bin/wp
 
 COPY docker/php/setup.sh /init-scripts/
 RUN chmod +x /init-scripts/setup.sh
+=======
+ARG WP_DB_NAME
+ARG WP_DB_USER
+ARG WP_DB_PASSWORD
+ARG WP_DB_HOST
+
+ENV WP_DB_NAME=${WP_DB_NAME} \
+    WP_DB_USER=${WP_DB_USER} \
+    WP_DB_PASSWORD=${WP_DB_PASSWORD} \
+    WP_DB_HOST=${WP_DB_HOST}
+>>>>>>> environment fix
 
 RUN docker-php-ext-install pdo pdo_mysql mysqli
 RUN a2enmod rewrite ssl

frontend.dockerfile

@@ -1,4 +1,5 @@
 FROM php:7.0-apache
+
 ARG API_URL
 ENV REACT_APP_API_URL ${API_URL}