ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #781 from winfried-van-loon/764-780-php-fpm-mysql 

Merging removed MySQL ext into MySQLi setting
This commit is contained in:
Mahmoud Zalt 2017-04-11 13:23:45 -04:00 committed by GitHub
parent 0b414813aa 80a60d58cf
commit b86211d2d8
5 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

@ -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}"

1
env-example
View File

@ -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

21
php-fpm/Dockerfile-56
View File

@ -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
#####################################

4
php-fpm/Dockerfile-70
View File

@ -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
#####################################

4
php-fpm/Dockerfile-71
View File

@ -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
#####################################