From 8a856fcf3ac11abda30c0f3cafae999ed005b697 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Wed, 30 Oct 2024 16:09:05 +1100 Subject: [PATCH] Added PHP_CLI_MEMORY_LIMIT envvar to configure php cli memory limit --- images/php/Dockerfile.cli | 6 +++--- images/php/README.md | 23 +++++++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/images/php/Dockerfile.cli b/images/php/Dockerfile.cli index 58ebfb37..59541d98 100644 --- a/images/php/Dockerfile.cli +++ b/images/php/Dockerfile.cli @@ -46,9 +46,9 @@ COPY db-build.sh /bay COPY db-dump-sanitized.sh /bay COPY mtk /bay/mtk -# Change worker pool from dynamic to static. Change default value to 24. -RUN sed -i "s/pm = dynamic/pm = static/" /usr/local/etc/php-fpm.d/www.conf -ENV PHP_FPM_PM_MAX_CHILDREN=24 +# Provide a separate environment variable to configure the php cli memory limit. +ENV PHP_CLI_MEMORY_LIMIT=1024M +RUN sed -i 's/\${PHP_MEMORY_LIMIT:/\${PHP_CLI_MEMORY_LIMIT:/g' "$PHP_INI_DIR/conf.d/00-lagoon-php.ini.tpl" ARG TZ=Australia/Melbourne RUN apk add --no-cache tzdata \ diff --git a/images/php/README.md b/images/php/README.md index 4172046c..e7b37907 100644 --- a/images/php/README.md +++ b/images/php/README.md @@ -28,17 +28,20 @@ services: ## Environment Variables -| Name | Default Value | Description | -|------|---------------|-------------| -| `BAY_DISABLE_FUNCTIONS` | (see source code) | A list of PHP functions to disable. Security feature to disable potential attack vectors. | -| `BAY_UPLOAD_LIMIT` | `100M` | Payload size supported by PHP. Synchronises the value across several php configuration elements. | -| `BAY_POST_MAX` | `100M` | | -| `BAY_SESSION_NAME` | `PHPSESSID` | | -| `BAY_SESSION_COOKIE_LIFETIME` | `28800` | | -| `BAY_SESSION_STRICT` | `1` | | -| `BAY_SESSION_SID_LEN` | `256` | | -| `BAY_SESSION_SID_BITS` | `6` | | +| Name | Default Value | Description | +|------|-------------------|--------------------------------------------------------------------------------------------------| +| `BAY_DISABLE_FUNCTIONS` | (see source code) | A list of PHP functions to disable. Security feature to disable potential attack vectors. | +| `BAY_UPLOAD_LIMIT` | `100M` | Payload size supported by PHP. Synchronises the value across several php configuration elements. | +| `BAY_POST_MAX` | `100M` | | +| `BAY_SESSION_NAME` | `PHPSESSID` | | +| `BAY_SESSION_COOKIE_LIFETIME` | `28800` | | +| `BAY_SESSION_STRICT` | `1` | | +| `BAY_SESSION_SID_LEN` | `256` | | +| `BAY_SESSION_SID_BITS` | `6` | | +| `PHP_CLI_MEMORY_LIMIT` | `1024M` | Default memory_limit for CLI container. | +| `PHP_FPM_EXPORTER_ENABLED` | `false` | Toggle for php-fpm metrics exporter. | ## Ports - 9000 - PHP FPM port +- 9253 - php-fpm_exporter metrics endpoint