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

Split up mysqli and tokenizer

This commit is contained in:
Marius van Zundert 2017-03-06 09:03:12 +01:00
parent b45f395996
commit 603010cbd5
4 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker-compose.yml
View File

@ -56,9 +56,10 @@ services:
- INSTALL_PHPREDIS=${PHP_FPM_INSTALL_PHPREDIS}
- INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
- INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
- INSTALL_EXIF=${PHP_FPM_DOCKER_FILE}
- INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_DOCKER_FILE}
- CODEIGNITER=${PHP_FPM_DOCKER_FILE}
- INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
- INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}
- INSTALL_MYSQLI=${PHP_FPM_MYSQLI}
- INSTALL_TOKENIZER=${PHP_FPM_TOKENIZER}
dockerfile: ${PHP_FPM_DOCKER_FILE}
volumes_from:
- applications

3
env-example
View File

@ -51,7 +51,8 @@ PHP_FPM_INSTALL_MEMCACHED=false
PHP_FPM_INSTALL_OPCACHE=false
PHP_FPM_INSTALL_EXIF=false
PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false
PHP_FPM_CODEIGNITER=falses
PHP_FPM_MYSQLI=false
PHP_FPM_TOKENIZER=false
# NGINX
NGINX_HOST_HTTP_PORT=8080

19
php-fpm/Dockerfile-56
View File

@ -142,13 +142,22 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \
COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
#####################################
# Codeigniter Modifications:
# Mysqli Modifications:
#####################################
ARG CODEIGNITER=false
RUN if [ ${CODEIGNITER} = true ]; then \
# Install Codeigniter PHP extentions requirements
docker-php-ext-install mysqli && \
ARG INSTALL_MYSQLI=false
RUN if [ ${INSTALL_MYSQLI} = true ]; then \
# Install mysqli PHP extentions requirements
docker-php-ext-install mysqli && \
;fi
#####################################
# Tokenizer Modifications:
#####################################
ARG INSTALL_TOKENIZER=false
RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
# Install tokenizer PHP extentions requirements
docker-php-ext-install tokenizer \
;fi

19
php-fpm/Dockerfile-70
View File

@ -176,13 +176,22 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \
COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
#####################################
# Codeigniter Modifications:
# Mysqli Modifications:
#####################################
ARG CODEIGNITER=false
RUN if [ ${CODEIGNITER} = true ]; then \
# Install Codeigniter PHP extentions requirements
docker-php-ext-install mysqli && \
ARG INSTALL_MYSQLI=false
RUN if [ ${INSTALL_MYSQLI} = true ]; then \
# Install mysqli PHP extentions requirements
docker-php-ext-install mysqli && \
;fi
#####################################
# Tokenizer Modifications:
#####################################
ARG INSTALL_TOKENIZER=false
RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
# Install tokenizer PHP extentions requirements
docker-php-ext-install tokenizer \
;fi