Merging removed MySQL ext into MySQLi setting
This commit is contained in:
		@@ -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
 | 
			
		||||
 | 
			
		||||
#####################################
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user