Merging removed MySQL ext into MySQLi setting

Author: winfried-van-loon

docker-compose.yml

@@ -64,7 +64,6 @@ services:
           - INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
           - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}
           - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
-          - INSTALL_MYSQL=${PHP_FPM_INSTALL_MYSQL}
           - INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
           - INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
         dockerfile: "Dockerfile-${PHP_VERSION}"

env-example

@@ -46,7 +46,6 @@ PHP_FPM_INSTALL_OPCACHE=false
 PHP_FPM_INSTALL_EXIF=false
 PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false
 PHP_FPM_INSTALL_MYSQLI=false
-PHP_FPM_INSTALL_MYSQL=false
 PHP_FPM_INSTALL_TOKENIZER=false
 PHP_FPM_INSTALL_INTL=false
 

php-fpm/Dockerfile-56

@@ -107,20 +107,6 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
     docker-php-ext-enable memcached \
 ;fi
 
-#####################################
-# PHP MySQL:
-#####################################
-
-ARG INSTALL_MYSQL=false
-COPY ./mysql.ini /usr/local/etc/php/conf.d/mysql.ini
-RUN if [ ${INSTALL_MYSQL} = true ]; then \
-    # Install the php mysql extension
-    docker-php-ext-install mysql && \
-    docker-php-ext-install mysqli && \
-    docker-php-ext-enable mysql && \
-    docker-php-ext-enable mysqli \
-;fi
-
 #####################################
 # PHP Aerospike:
 #####################################
@@ -162,8 +148,11 @@ COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
 #####################################
 
 ARG INSTALL_MYSQLI=false
-RUN if [ ${INSTALL_MYSQLI} = true ]; then \  
-     docker-php-ext-install mysqli \
+# MySQL extenstion is available for Php5.6 and lower only
+COPY ./mysql.ini /usr/local/etc/php/conf.d/mysql.ini
+RUN if [ ${INSTALL_MYSQLI} = true ]; then \
+    docker-php-ext-install mysql && \
+    docker-php-ext-install mysqli \
 ;fi
 
 #####################################

php-fpm/Dockerfile-70

@@ -178,8 +178,8 @@ COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
 # Mysqli Modifications:
 #####################################
 ARG INSTALL_MYSQLI=false
-RUN if [ ${INSTALL_MYSQLI} = true ]; then \    
-     docker-php-ext-install mysqli \
+RUN if [ ${INSTALL_MYSQLI} = true ]; then \
+    docker-php-ext-install mysqli \
 ;fi
 
 #####################################

php-fpm/Dockerfile-71

@@ -132,8 +132,8 @@ COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
 # Mysqli Modifications:
 #####################################
 ARG INSTALL_MYSQLI=false
-RUN if [ ${INSTALL_MYSQLI} = true ]; then \    
-     docker-php-ext-install mysqli \
+RUN if [ ${INSTALL_MYSQLI} = true ]; then \
+    docker-php-ext-install mysqli \
 ;fi
 
 #####################################