From 80a60d58cff2984983ac5183be0343f931c52937 Mon Sep 17 00:00:00 2001 From: Winfried Date: Tue, 11 Apr 2017 13:22:07 +0200 Subject: [PATCH] Merging removed MySQL ext into MySQLi setting --- docker-compose.yml | 1 - env-example | 1 - php-fpm/Dockerfile-56 | 21 +++++---------------- php-fpm/Dockerfile-70 | 4 ++-- php-fpm/Dockerfile-71 | 4 ++-- 5 files changed, 9 insertions(+), 22 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6f38e6c..959699d 100644 --- a/docker-compose.yml +++ b/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}" diff --git a/env-example b/env-example index ef7c258..412d5f8 100644 --- a/env-example +++ b/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 diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 5376484..91039ec 100644 --- a/php-fpm/Dockerfile-56 +++ b/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 ##################################### diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 11a1e3e..629735e 100644 --- a/php-fpm/Dockerfile-70 +++ b/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 ##################################### diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 94beab0..f69f180 100644 --- a/php-fpm/Dockerfile-71 +++ b/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 #####################################