Merge branch 'master' into MSSQL_SUPPORT
This commit is contained in:
		@@ -176,13 +176,19 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \
 | 
			
		||||
COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
 | 
			
		||||
 | 
			
		||||
#####################################
 | 
			
		||||
# Codeigniter Modifications:
 | 
			
		||||
# Mysqli Modifications:
 | 
			
		||||
#####################################
 | 
			
		||||
ARG INSTALL_MYSQLI=false
 | 
			
		||||
RUN if [ ${INSTALL_MYSQLI} = true ]; then \    
 | 
			
		||||
     docker-php-ext-install mysqli \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
#####################################
 | 
			
		||||
# Tokenizer Modifications:
 | 
			
		||||
#####################################
 | 
			
		||||
 | 
			
		||||
ARG CODEIGNITER=false
 | 
			
		||||
RUN if [ ${CODEIGNITER} = true ]; then \
 | 
			
		||||
    # Install Codeigniter PHP extentions requirements
 | 
			
		||||
     docker-php-ext-install mysqli && \
 | 
			
		||||
ARG INSTALL_TOKENIZER=false
 | 
			
		||||
RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
 | 
			
		||||
     docker-php-ext-install tokenizer \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
@@ -258,6 +264,34 @@ RUN if [ ${MSSQL} = true ]; then \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#####################################
 | 
			
		||||
# Human Language and Character Encoding Support:
 | 
			
		||||
#####################################
 | 
			
		||||
 | 
			
		||||
ARG INSTALL_INTL=false
 | 
			
		||||
RUN if [ ${INSTALL_INTL} = true ]; then \
 | 
			
		||||
    # Install intl and requirements
 | 
			
		||||
    apt-get install -y zlib1g-dev libicu-dev g++ && \
 | 
			
		||||
    docker-php-ext-configure intl && \
 | 
			
		||||
    docker-php-ext-install intl \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
#####################################
 | 
			
		||||
# GHOSTSCRIPT:
 | 
			
		||||
#####################################
 | 
			
		||||
 | 
			
		||||
ARG GHOSTSCRIPT=false
 | 
			
		||||
RUN if [ ${GHOSTSCRIPT} = true ]; then \
 | 
			
		||||
    # Install the ghostscript extension
 | 
			
		||||
    # for PDF editing
 | 
			
		||||
    apt-get -y update \
 | 
			
		||||
    && apt-get install -y \
 | 
			
		||||
    poppler-utils \
 | 
			
		||||
    ghostscript \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
#--------------------------------------------------------------------------
 | 
			
		||||
# Final Touch
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user