diff --git a/.env.example b/.env.example index 38c2536..9bd9bef 100644 --- a/.env.example +++ b/.env.example @@ -8,14 +8,16 @@ WORKSPACE_PGID=1000 WORKSPACE_TIMEZONE=Europe/Moscow WORKSPACE_COMPOSER_VERSION=2 WORKSPACE_CUSTOM_NODE_VERSION=lts/fermium +WORKSPACE_PHP_OPT_MAX_EXECUTION_TIME=0 +WORKSPACE_PHP_OPT_MEMORY_LIMIT=-1 ### PHP-FPM ############################################# INSTALL_REDIS=true INSTALL_PEAR_MAIL=true PHP_OPT_SHORT_OPEN_TAG=Off PHP_OPT_MAX_EXECUTION_TIME=600 -PHP_OPT_MEMORY_LIMIT=500M -PHP_OPT_POST_MAX_SIZE=300M +PHP_OPT_MEMORY_LIMIT=256M +PHP_OPT_POST_MAX_SIZE=800M PHP_OPT_UPLOAD_MAX_FILESIZE=200M ### MINIO S3 ############################################# diff --git a/docker-compose.base.yml b/docker-compose.base.yml index f7471e3..eb6eda7 100755 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -41,10 +41,8 @@ services: - COMPOSER_VERSION=${WORKSPACE_COMPOSER_VERSION} - CUSTOM_NODE_VERSION=${WORKSPACE_CUSTOM_NODE_VERSION} - 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_POST_MAX_SIZE=${PHP_OPT_POST_MAX_SIZE} - - PHP_OPT_UPLOAD_MAX_FILESIZE=${PHP_OPT_UPLOAD_MAX_FILESIZE} + - PHP_OPT_MAX_EXECUTION_TIME=${WORKSPACE_PHP_OPT_MAX_EXECUTION_TIME} + - PHP_OPT_MEMORY_LIMIT=${WORKSPACE_PHP_OPT_MEMORY_LIMIT} restart: always volumes: - ${PROJECTS_DIR}:/var/www diff --git a/dockerfiles/workspace/workspace73.Dockerfile b/dockerfiles/workspace/workspace73.Dockerfile index d9f7582..70418c6 100644 --- a/dockerfiles/workspace/workspace73.Dockerfile +++ b/dockerfiles/workspace/workspace73.Dockerfile @@ -102,12 +102,6 @@ RUN sed -i "s/^max_execution_time = .*/max_execution_time = $PHP_OPT_MAX_EXECUTI ARG PHP_OPT_MEMORY_LIMIT=256M RUN sed -i "s/^memory_limit = .*/memory_limit = $PHP_OPT_MEMORY_LIMIT/g" /etc/php/${PHP_VERSION}/cli/php.ini -ARG PHP_OPT_POST_MAX_SIZE=48M -RUN sed -i "s/^post_max_size = .*/post_max_size = $PHP_OPT_UPLOAD_MAX_FILESIZE/g" /etc/php/${PHP_VERSION}/cli/php.ini - -ARG PHP_OPT_UPLOAD_MAX_FILESIZE=16M -RUN sed -i "s/^upload_max_filesize = .*/upload_max_filesize = $PHP_OPT_UPLOAD_MAX_FILESIZE/g" /etc/php/${PHP_VERSION}/cli/php.ini - ########################################################################### # Crontab ########################################################################### diff --git a/dockerfiles/workspace/workspace74.Dockerfile b/dockerfiles/workspace/workspace74.Dockerfile index 83ad486..815f0d0 100644 --- a/dockerfiles/workspace/workspace74.Dockerfile +++ b/dockerfiles/workspace/workspace74.Dockerfile @@ -102,12 +102,6 @@ RUN sed -i "s/^max_execution_time = .*/max_execution_time = $PHP_OPT_MAX_EXECUTI ARG PHP_OPT_MEMORY_LIMIT=256M RUN sed -i "s/^memory_limit = .*/memory_limit = $PHP_OPT_MEMORY_LIMIT/g" /etc/php/${PHP_VERSION}/cli/php.ini -ARG PHP_OPT_POST_MAX_SIZE=48M -RUN sed -i "s/^post_max_size = .*/post_max_size = $PHP_OPT_UPLOAD_MAX_FILESIZE/g" /etc/php/${PHP_VERSION}/cli/php.ini - -ARG PHP_OPT_UPLOAD_MAX_FILESIZE=16M -RUN sed -i "s/^upload_max_filesize = .*/upload_max_filesize = $PHP_OPT_UPLOAD_MAX_FILESIZE/g" /etc/php/${PHP_VERSION}/cli/php.ini - ########################################################################### # Crontab ########################################################################### diff --git a/dockerfiles/workspace/workspace81.Dockerfile b/dockerfiles/workspace/workspace81.Dockerfile index e77e239..15e16ba 100644 --- a/dockerfiles/workspace/workspace81.Dockerfile +++ b/dockerfiles/workspace/workspace81.Dockerfile @@ -96,12 +96,6 @@ RUN sed -i "s/^max_execution_time = .*/max_execution_time = $PHP_OPT_MAX_EXECUTI ARG PHP_OPT_MEMORY_LIMIT=256M RUN sed -i "s/^memory_limit = .*/memory_limit = $PHP_OPT_MEMORY_LIMIT/g" /etc/php/${PHP_VERSION}/cli/php.ini -ARG PHP_OPT_POST_MAX_SIZE=48M -RUN sed -i "s/^post_max_size = .*/post_max_size = $PHP_OPT_UPLOAD_MAX_FILESIZE/g" /etc/php/${PHP_VERSION}/cli/php.ini - -ARG PHP_OPT_UPLOAD_MAX_FILESIZE=16M -RUN sed -i "s/^upload_max_filesize = .*/upload_max_filesize = $PHP_OPT_UPLOAD_MAX_FILESIZE/g" /etc/php/${PHP_VERSION}/cli/php.ini - ########################################################################### # Crontab ###########################################################################