- remove rename php.ini-development from user space build
- temporary disable igbinary, because install not successfully completed with segmentation fault * partition of tune opts semantically divided - remove unused env-vars from docker compose base in src and user space builds
This commit is contained in:
@ -6,22 +6,15 @@ services:
|
||||
context: ./dockerfiles/php-fpm
|
||||
args:
|
||||
- INSTALL_XDEBUG=${INSTALL_XDEBUG}
|
||||
- INSTALL_REDIS=${INSTALL_REDIS}
|
||||
- INSTALL_ZIP=${INSTALL_ZIP}
|
||||
- INSTALL_BZ2=${INSTALL_BZ2}
|
||||
- INSTALL_INTL=${INSTALL_INTL}
|
||||
- INSTALL_PGSQL=${INSTALL_PGSQL}
|
||||
- INSTALL_BCMATH=${INSTALL_BCMATH}
|
||||
- INSTALL_PEAR_MAIL=${INSTALL_PEAR_MAIL}
|
||||
- PHP_OPT_SHORT_OPEN_TAG=${PHP_OPT_SHORT_OPEN_TAG}
|
||||
- PHP_OPT_MAX_EXECUTION_TIME=${PHP_OPT_MAX_EXECUTION_TIME}
|
||||
- PHP_OPT_MEMORY_LIMIT=${PHP_OPT_MEMORY_LIMIT}
|
||||
- PHP_OPT_UPLOAD_MAX_FILESIZE=${PHP_OPT_UPLOAD_MAX_FILESIZE}
|
||||
restart: always
|
||||
volumes:
|
||||
- ${PROJECTS_DIR}:/usr/share/nginx/html
|
||||
expose:
|
||||
- 9000
|
||||
workspace:
|
||||
build:
|
||||
context: ./dockerfiles/workspace
|
||||
@ -46,8 +39,3 @@ services:
|
||||
- INSTALL_GULP=${WORKSPACE_INSTALL_GULP}
|
||||
- INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
|
||||
- YARN_VERSION=${WORKSPACE_YARN_VERSION}
|
||||
restart: always
|
||||
volumes:
|
||||
- ${PROJECTS_DIR}:/var/www
|
||||
extra_hosts:
|
||||
- "dockerhost:${DOCKER_HOST_IP}"
|
||||
|
@ -102,6 +102,10 @@ RUN sed -i "s/^log_limit = .*/log_limit = 1024/g" "$PHP_INI_DIR/../php-fpm.d/doc
|
||||
# https://github.com/php/php-src/blob/master/php.ini-development
|
||||
RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
|
||||
|
||||
###########################################################################
|
||||
# Tune opts:
|
||||
###########################################################################
|
||||
|
||||
ARG PHP_OPT_SHORT_OPEN_TAG=Off
|
||||
RUN sed -i "s/^short_open_tag = .*/short_open_tag = $PHP_OPT_SHORT_OPEN_TAG/g" "$PHP_INI_DIR/php.ini"
|
||||
|
||||
|
Reference in New Issue
Block a user