Merge branch 'master' of github.com:laradock/laradock
This commit is contained in:
		@@ -10,7 +10,7 @@
 | 
			
		||||
#    https://hub.docker.com/r/laradock/php-fpm/tags/
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
FROM laradock/php-fpm:7.1--0.0 # placeholder. Need change after new image would be built.
 | 
			
		||||
FROM laradock/php-fpm:7.1--1.3
 | 
			
		||||
 | 
			
		||||
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 | 
			
		||||
 | 
			
		||||
@@ -146,6 +146,32 @@ RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
 | 
			
		||||
     docker-php-ext-install tokenizer \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
#####################################
 | 
			
		||||
# Human Language and Character Encoding Support:
 | 
			
		||||
#####################################
 | 
			
		||||
 | 
			
		||||
ARG INTL=false
 | 
			
		||||
RUN if [ ${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