Skip to content

Commit 66d7c75

Browse files
tiredofittiredofit
committed
Release 7.0.1 - See CHANGELOG.md
1 parent fed5b77 commit 66d7c75

File tree

5 files changed

+37
-28
lines changed

5 files changed

+37
-28
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 7.0.1 2022-07-03 <dave at tiredofit dot ca>
2+
3+
### Added
4+
- Add PHP_FPM_OUTPUT_BUFFER_SIZE environment variable
5+
6+
17
## 7.0.0 2022-06-23 <dave at tiredofit dot ca>
28

39
### Added

‎README.md‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ The following image tags are available along with their tagged release based on
8181
| PHP version | Alpine Base | Tag | Debian Base | Tag |
8282
| ----------- | ----------- | -------------- | ----------- | ------------- |
8383
| latest | edge | `:alpine-edge` | | |
84-
| 8.1.x | edge | `:alpine-8.1` | Buster | `:debian-8.1` |
85-
| 8.0.x | 3.15 | `:alpine-8.0` | Buster | `:debian-8.0` |
84+
| 8.1.x | 3.16 | `:alpine-8.1` | Buster | `:debian-8.1` |
85+
| 8.0.x | 3.16 | `:alpine-8.0` | Buster | `:debian-8.0` |
8686
| 7.4.x | 3.15 | `:alpine-7.4` | Buster | `:debian-7.3` |
8787
| 7.3.x | 3.12 | `:alpine-7.3` | Buster | `:debian-7.3` |
8888
| 7.2.x | 3.9 | `:alpine-7.2` | | |
@@ -143,31 +143,32 @@ When `PHP_FPM_CONTAINER_MODE` set to `nginx` the `PHP_FPM_LISTEN_PORT` environme
143143

144144
*You can also pass arguments to each server as defined in the [Nginx Upstream Documentation](https://nginx.org/en/docs/http/ngx_http_upstream_module.html)*
145145

146-
| Parameter | Description | Default |
147-
| --------------------------- | -------------------------------------------------------------------------------------------------------- | ---------------------------------------------- |
148-
| `PHP_APC_SHM_SIZE` | APC Cache Memory size - `0` to disable | `128M` |
149-
| `PHP_FPM_HOST` | Default PHP-FPM Host, seperate multiple by commas | `127.0.0.1:9000` - See above Container options |
150-
| `PHP_FPM_LISTEN_PORT` | PHP-FPM Listening Port - Ignored with above container options | `9000` |
151-
| `PHP_FPM_MAX_CHILDREN` | Maximum Children | `75` |
152-
| `PHP_FPM_MAX_REQUESTS` | How many requests before spawning new server | `500` |
153-
| `PHP_FPM_MAX_SPARE_SERVERS` | Maximum Spare Servers available | `3` |
154-
| `PHP_FPM_MIN_SPARE_SERVERS` | Minium Spare Servers avaialble | `1` |
155-
| `PHP_FPM_POST_INIT_COMMAND` | If you wish to execute a command before php-fpm executes, enter it here and seperate multiples by comma. | |
156-
| `PHP_FPM_POST_INIT_SCRIPT` | If you wish to execute a script before php-fpm executes, enter it here and seperate multiples by comma. | |
157-
| `PHP_FPM_PROCESS_MANAGER` | How to handle processes `static`, `ondemand`, `dynamic` | `dynamic` |
158-
| `PHP_FPM_START_SERVERS` | How many FPM servers to start initially | `2` |
159-
| `PHP_LOG_ACCESS_FILE` | PHP Access Logfile Name | `access.log` |
160-
| `PHP_LOG_ERROR_FILE` | Logfile name | `error.log` |
161-
| `PHP_LOG_LEVEL` | PHP Log Level `alert` `error` `warning` `notice` `debug` | `notice` |
162-
| `PHP_LOG_ACCESS_FORMAT` | Log format - `default` or `json` | `default` |
163-
| `PHP_LOG_LIMIT` | Characters to log | `2048` |
164-
| `PHP_LOG_LOCATION` | Log Location for PHP Logs | `/www/logs/php-fpm` |
165-
| `PHP_MEMORY_LIMIT` | How much memory should PHP use | `128M` |
166-
| `PHP_OPCACHE_MEM_SIZE` | OPCache Memory Size - Set `0` to disable or via other env vars | `128` |
167-
| `PHP_POST_MAX_SIZE` | Maximum Input Size for POST | `2G` |
168-
| `PHP_TIMEOUT` | Maximum Script execution Time | `180` |
169-
| `PHP_UPLOAD_MAX_SIZE` | Maximum Input Size for Uploads | `2G` |
170-
| `PHP_WEBROOT` | Used with `CONTAINER_MODE=php-fpm` | `/www/html` |
146+
| Parameter | Description | Default |
147+
| ---------------------------- | -------------------------------------------------------------------------------------------------------- | ---------------------------------------------- |
148+
| `PHP_APC_SHM_SIZE` | APC Cache Memory size - `0` to disable | `128M` |
149+
| `PHP_FPM_HOST` | Default PHP-FPM Host, seperate multiple by commas | `127.0.0.1:9000` - See above Container options |
150+
| `PHP_FPM_LISTEN_PORT` | PHP-FPM Listening Port - Ignored with above container options | `9000` |
151+
| `PHP_FPM_MAX_CHILDREN` | Maximum Children | `75` |
152+
| `PHP_FPM_MAX_REQUESTS` | How many requests before spawning new server | `500` |
153+
| `PHP_FPM_MAX_SPARE_SERVERS` | Maximum Spare Servers available | `3` |
154+
| `PHP_FPM_MIN_SPARE_SERVERS` | Minium Spare Servers avaialble | `1` |
155+
| `PHP_FPM_OUTPUT_BUFFER_SIZE` | Output buffer size in bytes | `0` |
156+
| `PHP_FPM_POST_INIT_COMMAND` | If you wish to execute a command before php-fpm executes, enter it here and seperate multiples by comma. | |
157+
| `PHP_FPM_POST_INIT_SCRIPT` | If you wish to execute a script before php-fpm executes, enter it here and seperate multiples by comma. | |
158+
| `PHP_FPM_PROCESS_MANAGER` | How to handle processes `static`, `ondemand`, `dynamic` | `dynamic` |
159+
| `PHP_FPM_START_SERVERS` | How many FPM servers to start initially | `2` |
160+
| `PHP_LOG_ACCESS_FILE` | PHP Access Logfile Name | `access.log` |
161+
| `PHP_LOG_ERROR_FILE` | Logfile name | `error.log` |
162+
| `PHP_LOG_LEVEL` | PHP Log Level `alert` `error` `warning` `notice` `debug` | `notice` |
163+
| `PHP_LOG_ACCESS_FORMAT` | Log format - `default` or `json` | `default` |
164+
| `PHP_LOG_LIMIT` | Characters to log | `2048` |
165+
| `PHP_LOG_LOCATION` | Log Location for PHP Logs | `/www/logs/php-fpm` |
166+
| `PHP_MEMORY_LIMIT` | How much memory should PHP use | `128M` |
167+
| `PHP_OPCACHE_MEM_SIZE` | OPCache Memory Size - Set `0` to disable or via other env vars | `128` |
168+
| `PHP_POST_MAX_SIZE` | Maximum Input Size for POST | `2G` |
169+
| `PHP_TIMEOUT` | Maximum Script execution Time | `180` |
170+
| `PHP_UPLOAD_MAX_SIZE` | Maximum Input Size for Uploads | `2G` |
171+
| `PHP_WEBROOT` | Used with `CONTAINER_MODE=php-fpm` | `/www/html` |
171172

172173
#### Enabling / Disabling Specific Extensions
173174

‎install/assets/defaults/20-php-fpm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ PHP_FPM_MAX_CHILDREN=${PHP_FPM_MAX_CHILDREN:-"75"}
1313
PHP_FPM_MAX_REQUESTS=${PHP_FPM_MAX_REQUESTS:-"500"}
1414
PHP_FPM_MAX_SPARE_SERVERS=${PHP_FPM_MAX_SPARE_SERVERS:-"3"}
1515
PHP_FPM_MIN_SPARE_SERVERS=${PHP_FPM_MIN_SPARE_SERVERS:-"1"}
16+
PHP_FPM_OUTPUT_BUFFER_SIZE=${PHP_FPM_OUTPUT_BUFFER_SIZE:-"0"}
1617
PHP_FPM_PROCESS_MANAGER=${PHP_FPM_PROCESS_MANAGER:-"dynamic"}
1718
PHP_FPM_START_SERVERS=${PHP_FPM_START_SERVERS:-"2"}
1819
PHP_LOG_ACCESS_FILE=${PHP_LOG_ACCESS_FILE:-"access.log"}

‎install/assets/functions/20-php-fpm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ phpfpm_configure_server() {
195195
sed -i -e "s#<MAX_SPARE_SERVERS>#${PHP_FPM_MAX_SPARE_SERVERS}#g" /assets/php-fpm/fpm/php-fpm.conf
196196
sed -i -e "s#<MAX_START_SERVERS>#${PHP_FPM_START_SERVERS}#g" /assets/php-fpm/fpm/php-fpm.conf
197197
sed -i -e "s#<MIN_SPARE_SERVERS>#${PHP_FPM_MIN_SPARE_SERVERS}#g" /assets/php-fpm/fpm/php-fpm.conf
198+
sed -i -e "s#<OUTPUT_BUFFER_SIZE>#${PHP_FPM_OUTPUT_BUFFER_SIZE}#g" /assets/php-fpm/fpm/php-fpm.conf
198199
sed -i -e "s#<PHP_HOST>#${PHP_FPM_HOST}#g" /etc/nginx/snippets/php-fpm.conf
199200
sed -i -e "s#<PHP_LISTEN_PORT>#${PHP_FPM_LISTEN_PORT}#g" /etc/nginx/snippets/php-fpm.conf
200201
sed -i -e "s#<PHP_LOG_LOCATION>#${PHP_LOG_LOCATION}#g" /assets/php-fpm/fpm/php-fpm.conf

‎install/assets/php-fpm/fpm/php-fpm.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ php_admin_value[max_input_vars] = 10000
2626
php_admin_value[memory_limit] = <PHP_MEMORY_LIMIT>
2727
php_admin_value[openssl.cafile] = /etc/ssl/certs/ca-certificates.crt
2828
php_admin_value[openssl.capath] = /etc/ssl/certs
29-
php_admin_value[output_buffering] = 0
29+
php_admin_value[output_buffering] = <OUTPUT_BUFFER_SIZE>
3030
php_admin_value[post_max_size] = <POST_MAX_SIZE>
3131
php_admin_value[upload_max_filesize] = <UPLOAD_MAX_SIZE>
3232
php_flag[display_errors] = on

0 commit comments

Comments
 (0)