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

Merge branch 'non-framework' into multiple_frameworks

This commit is contained in:
Marius van Zundert 2017-03-09 09:33:40 +01:00
parent ff39e6045d 36fcc6674e
commit f7b94ac599
5 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache2/Dockerfile
View File

@ -6,11 +6,11 @@ ARG PHP_SOCKET=php-fpm:9000
ENV WEB_PHP_SOCKET=$PHP_SOCKET ENV WEB_PHP_SOCKET=$PHP_SOCKET
ENV WEB_DOCUMENT_ROOT=/var/www/public ENV WEB_DOCUMENT_ROOT=/var/www/
EXPOSE 80 443 EXPOSE 80 443
WORKDIR /var/www/public WORKDIR /var/www/
ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]

7
docker-compose.yml
View File

@ -7,7 +7,7 @@ services:
applications: applications:
image: tianon/true image: tianon/true
volumes: volumes:
- ${APPLICATIONS_HOST_DIR}:/var/www - ${APPLICATIONS_HOST_DIR}:/var/www
### Workspace Utilities Container ########################### ### Workspace Utilities Container ###########################
@ -57,8 +57,9 @@ services:
- INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED} - INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
- INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE} - INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
- INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF} - INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
- INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION} - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}
- CODEIGNITER=${PHP_FPM_CODEIGNITER} - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
- INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
dockerfile: ${PHP_FPM_DOCKER_FILE} dockerfile: ${PHP_FPM_DOCKER_FILE}
volumes_from: volumes_from:
- applications - applications

3
env-example
View File

@ -51,7 +51,8 @@ PHP_FPM_INSTALL_MEMCACHED=false
PHP_FPM_INSTALL_OPCACHE=false PHP_FPM_INSTALL_OPCACHE=false
PHP_FPM_INSTALL_EXIF=false PHP_FPM_INSTALL_EXIF=false
PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false
PHP_FPM_CODEIGNITER=false PHP_FPM_INSTALL_MYSQLI=false
PHP_FPM_INSTALL_TOKENIZER=false
# NGINX # NGINX
NGINX_HOST_HTTP_PORT=8080 NGINX_HOST_HTTP_PORT=8080

17
php-fpm/Dockerfile-56
View File

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

16
php-fpm/Dockerfile-70
View File

@ -176,13 +176,19 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \
COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini 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 ARG INSTALL_TOKENIZER=false
RUN if [ ${CODEIGNITER} = true ]; then \ RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
# Install Codeigniter PHP extentions requirements
docker-php-ext-install mysqli && \
docker-php-ext-install tokenizer \ docker-php-ext-install tokenizer \
;fi ;fi