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

Merge branch 'master' of https://github.com/Laradock/laradock 

* 'master' of https://github.com/Laradock/laradock:
  Update docker-compose.yml
  intl support
This commit is contained in:
Mahmoud Zalt 2017-03-17 02:46:35 -04:00
parent 94d88e91c5 9e290ffddb
commit 9ae6e45dda
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

@ -60,6 +60,7 @@ services:
- INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION} - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}
- INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI} - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
- INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER} - INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
- INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
dockerfile: ${PHP_FPM_DOCKER_FILE} dockerfile: ${PHP_FPM_DOCKER_FILE}
volumes_from: volumes_from:
- applications - applications

11
php-fpm/Dockerfile-70
View File

@ -192,6 +192,17 @@ RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
docker-php-ext-install tokenizer \ docker-php-ext-install tokenizer \
;fi ;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 \
##################################### #####################################
# GHOSTSCRIPT: # GHOSTSCRIPT:
##################################### #####################################