wpstudio/structure
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* passing to workspace containers php memory and execute time limit to infinity and remove inapplicable php opts to cli execution (post and max upload size data)

Browse Source
This commit is contained in:
dimti
2023-02-20 23:37:11 +03:00
parent ca9f40667b
commit c07f142607
5 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.env.example
View File

@ -8,14 +8,16 @@ WORKSPACE_PGID=1000
WORKSPACE_TIMEZONE=Europe/Moscow WORKSPACE_TIMEZONE=Europe/Moscow
WORKSPACE_COMPOSER_VERSION=2 WORKSPACE_COMPOSER_VERSION=2
WORKSPACE_CUSTOM_NODE_VERSION=lts/fermium WORKSPACE_CUSTOM_NODE_VERSION=lts/fermium
WORKSPACE_PHP_OPT_MAX_EXECUTION_TIME=0
WORKSPACE_PHP_OPT_MEMORY_LIMIT=-1
### PHP-FPM ############################################# ### PHP-FPM #############################################
INSTALL_REDIS=true INSTALL_REDIS=true
INSTALL_PEAR_MAIL=true INSTALL_PEAR_MAIL=true
PHP_OPT_SHORT_OPEN_TAG=Off PHP_OPT_SHORT_OPEN_TAG=Off
PHP_OPT_MAX_EXECUTION_TIME=600 PHP_OPT_MAX_EXECUTION_TIME=600
PHP_OPT_MEMORY_LIMIT=500M PHP_OPT_MEMORY_LIMIT=256M
PHP_OPT_POST_MAX_SIZE=300M PHP_OPT_POST_MAX_SIZE=800M
PHP_OPT_UPLOAD_MAX_FILESIZE=200M PHP_OPT_UPLOAD_MAX_FILESIZE=200M
### MINIO S3 ############################################# ### MINIO S3 #############################################

6
docker-compose.base.yml
View File

@ -41,10 +41,8 @@ services:
- COMPOSER_VERSION=${WORKSPACE_COMPOSER_VERSION} - COMPOSER_VERSION=${WORKSPACE_COMPOSER_VERSION}
- CUSTOM_NODE_VERSION=${WORKSPACE_CUSTOM_NODE_VERSION} - CUSTOM_NODE_VERSION=${WORKSPACE_CUSTOM_NODE_VERSION}
- PHP_OPT_SHORT_OPEN_TAG=${PHP_OPT_SHORT_OPEN_TAG} - PHP_OPT_SHORT_OPEN_TAG=${PHP_OPT_SHORT_OPEN_TAG}
- PHP_OPT_MAX_EXECUTION_TIME=${PHP_OPT_MAX_EXECUTION_TIME} - PHP_OPT_MAX_EXECUTION_TIME=${WORKSPACE_PHP_OPT_MAX_EXECUTION_TIME}
- PHP_OPT_MEMORY_LIMIT=${PHP_OPT_MEMORY_LIMIT} - PHP_OPT_MEMORY_LIMIT=${WORKSPACE_PHP_OPT_MEMORY_LIMIT}
- PHP_OPT_POST_MAX_SIZE=${PHP_OPT_POST_MAX_SIZE}
- PHP_OPT_UPLOAD_MAX_FILESIZE=${PHP_OPT_UPLOAD_MAX_FILESIZE}
restart: always restart: always
volumes: volumes:
- ${PROJECTS_DIR}:/var/www - ${PROJECTS_DIR}:/var/www

6
dockerfiles/workspace/workspace73.Dockerfile
View File

@ -102,12 +102,6 @@ RUN sed -i "s/^max_execution_time = .*/max_execution_time = $PHP_OPT_MAX_EXECUTI
ARG PHP_OPT_MEMORY_LIMIT=256M 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 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 # Crontab
########################################################################### ###########################################################################

6
dockerfiles/workspace/workspace74.Dockerfile
View File

@ -102,12 +102,6 @@ RUN sed -i "s/^max_execution_time = .*/max_execution_time = $PHP_OPT_MAX_EXECUTI
ARG PHP_OPT_MEMORY_LIMIT=256M 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 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 # Crontab
########################################################################### ###########################################################################

6
dockerfiles/workspace/workspace81.Dockerfile
View File

@ -96,12 +96,6 @@ RUN sed -i "s/^max_execution_time = .*/max_execution_time = $PHP_OPT_MAX_EXECUTI
ARG PHP_OPT_MEMORY_LIMIT=256M 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 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 # Crontab
########################################################################### ###########################################################################