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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Mahmoud Zalt
2017-04-12 00:53:43 -04:00
committed by GitHub
parent 597f922db7 96e82d4115
commit f69422e82f
5 changed files with 80 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
php-fpm/Dockerfile-70
View File

@ -34,7 +34,6 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
# in the `docker-compose.yml` before the build.
# Example:
# - INSTALL_ZIP_ARCHIVE=true
# - ...
#
#####################################
@ -60,6 +59,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
docker-php-ext-enable xdebug \
;fi
# Copy xdebug configration for remote debugging
COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
#####################################
# PHP REDIS EXTENSION FOR PHP 7
#####################################
@ -72,9 +74,6 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
&& docker-php-ext-enable redis \
;fi
# Copy xdebug configration for remote debugging
COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
#####################################
# MongoDB:
#####################################
@ -135,11 +134,9 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
ARG INSTALL_EXIF=false
RUN if [ ${INSTALL_EXIF} = true ]; then \
# Enable Exif PHP extentions requirements
docker-php-ext-install exif && \
docker-php-ext-enable exif \
docker-php-ext-install exif \
;fi
#####################################
# PHP Aerospike:
#####################################
@ -166,10 +163,10 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \
#####################################
# Opcache:
#####################################
ARG INSTALL_OPCACHE=false
RUN if [ ${INSTALL_OPCACHE} = true ]; then \
docker-php-ext-install opcache && \
docker-php-ext-enable opcache \
docker-php-ext-install opcache \
;fi
# Copy opcache configration
@ -178,6 +175,7 @@ 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 \
@ -189,12 +187,13 @@ RUN if [ ${INSTALL_MYSQLI} = true ]; then \
ARG INSTALL_TOKENIZER=false
RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
docker-php-ext-install tokenizer \
docker-php-ext-install tokenizer \
;fi
#####################################
# SQL SERVER:
#####################################
ARG MSSQL=false
RUN if [ ${MSSQL} = true ]; then \
@ -271,8 +270,6 @@ RUN if [ ${MSSQL} = true ]; then \
&& locale-gen \
;fi
#####################################
# Human Language and Character Encoding Support:
#####################################