Merge pull request #21 from ushahidi/mysql-php-update-201909

update running env to mysql 5.7 and php 7.1

Author: rowasc

Dockerfile

@@ -1,4 +1,4 @@
-FROM ushahidi/php-fpm-nginx:php-7.0
+FROM ushahidi/php-fpm-nginx:php-7.1
 
 WORKDIR /var/www
 
@@ -17,7 +17,7 @@ COPY build_env.sh /build_env.sh
 COPY dist/ /dist
 
 ENV SERVER_FLAVOR=nginx \
-    PHP_FPM_CONFIG=/etc/php/7.0/fpm \
-    PHP_FPM_PATH=/usr/sbin/php-fpm7.0
+    PHP_FPM_CONFIG=/etc/php/7.1/fpm \
+    PHP_FPM_PATH=/usr/sbin/php-fpm7.1
 
 ENTRYPOINT [ "/bin/bash", "/run.sh" ]

Dockerfile.apache

@@ -1,4 +1,4 @@
-FROM php:7.0.32-apache
+FROM php:7.1-apache
 
 RUN apt-get update && apt-get install -y \
       libfreetype6-dev \

docker-compose.apache.yml

@@ -17,11 +17,9 @@ services:
       MYSQL_USER: ushahidi
       MYSQL_PASSWORD: ushahidi
   mysql:
-    build:
-      context: ./docker/mysql
-      dockerfile: Dockerfile
+    image: mysql:5.7
     environment:
+      MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: ushahidi
       MYSQL_USER: ushahidi
       MYSQL_PASSWORD: ushahidi
- 

docker-compose.yml

@@ -15,10 +15,9 @@ services:
       MYSQL_USER: ushahidi
       MYSQL_PASSWORD: ushahidi
   mysql:
-    build:
-      context: ./docker/mysql
-      dockerfile: Dockerfile
+    image: mysql:5.7
     environment:
+      MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: ushahidi
       MYSQL_USER: ushahidi
       MYSQL_PASSWORD: ushahidi

docker/mysql/Dockerfile

@@ -248,7 +248,7 @@ stderr_logfile_maxbytes=0
 
 [program:tail-phpfpm]
 autorestart=false
-command=tail -f /var/log/php7.0-fpm.log
+command=tail -f /var/log/php7.1-fpm.log
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/fd/2