merge upstream

This commit is contained in:
牟勇
2017-11-23 13:42:33 +08:00
9 changed files with 38 additions and 21 deletions

View File

@ -7,6 +7,14 @@
CHANGE_SOURCE=false
### Docker compose files ###############################################################################################
# Select which docker-compose files to include.
COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
# Replace the above with the following line if you wish to use docker-sync.
# COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml:docker-compose.sync.yml
### Application Path ###################################################################################################
# Point to your code, will be available at `/var/www`.
@ -100,7 +108,6 @@ PHP_FPM_INSTALL_EXIF=false
PHP_FPM_INSTALL_AEROSPIKE=false
PHP_FPM_INSTALL_MYSQLI=false
PHP_FPM_INSTALL_PGSQL=false
PHP_FPM_INSTALL_POSTGRES=false
PHP_FPM_INSTALL_TOKENIZER=false
PHP_FPM_INSTALL_INTL=false
PHP_FPM_INSTALL_GHOSTSCRIPT=false