senaduka/old-new-wiaas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix docker file

Browse Source
This commit is contained in:
GotPPay
2018-08-02 14:28:42 +02:00
parent 9d24fd8649
commit a35fd40e3a
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend.dockerfile
View File

@@ -1,6 +1,5 @@
FROM php:7.0-apache FROM php:7.0-apache
<<<<<<< HEAD
ARG API_URL ARG API_URL
ARG MYSQL_DATABASE ARG MYSQL_DATABASE
@@ -46,17 +45,6 @@ RUN chmod +x /usr/local/bin/wp
COPY docker/php/setup.sh /init-scripts/ COPY docker/php/setup.sh /init-scripts/
RUN chmod +x /init-scripts/setup.sh 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 docker-php-ext-install pdo pdo_mysql mysqli
RUN a2enmod rewrite ssl RUN a2enmod rewrite ssl