Skip to content

Commit 3f2ef3c

Browse files
tiredofittiredofit
committed
Release 7.1.0 - See CHANGELOG.md
1 parent 8d0e90a commit 3f2ef3c

File tree

6 files changed

+73
-56
lines changed

6 files changed

+73
-56
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 7.1.0 2022-10-01 <dave at tiredofit dot ca>
2+
3+
### Added
4+
- Convert to using update_template functions when configuring
5+
6+
### Changed
7+
- Fix an error where sample php file wasn't being created properly
8+
9+
110
## 7.0.11 2022-09-16 <dave at tiredofit dot ca>
211

312
### Changed

‎Dockerfile.debian‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ ENV PHP_BASE=${PHP_BASE:-"8.0"} \
3333
PHP_ENABLE_XMLREADER=TRUE \
3434
PHP_ENABLE_XMLWRITER=TRUE \
3535
CONTAINER_ENABLE_MESSAGING=TRUE \
36-
NGINX_ENABLE_CREATE_SAMPLE_HTML=FALSE
36+
NGINX_ENABLE_CREATE_SAMPLE_HTML=FALSE \
37+
IMAGE_NAME="tiredofit/nginx-php-fpm" \
38+
IMAGE_REPO_URL="https://github.com/tiredofit/docker-nginx-php-fpm/"
3739

3840
### Dependency Installation
3941
RUN export PHP_7_3_RUN_DEPS=" \

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

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ EOF
126126
fi
127127

128128
if var_false "${PHP_KITCHENSINK}" ; then
129+
php_enable_create_sample_php=${PHP_ENABLE_CREATE_SAMPLE_PHP}
129130
unset PHP_ENABLE_CREATE_SAMPLE_PHP # legacy
130-
unset PHP_ENABLE_DISPLAY_ERRORS # legacy
131131
php_env_plugins_enabled=$(set -o posix; set | sort | grep PHP_ENABLE_ | grep -i TRUE |sed -e 's/PHP_ENABLE_//g' | sed -e 's/=TRUE//g' | awk -vRS="" -vOFS=', ' '$1=$1' | tr A-Z a-z)
132132
for module in $(echo "${php_env_plugins_enabled}" | tr "," "\n" ) ; do
133133
if [ -f "${php_prefix}"/mods-available/${module}.ini ]; then
@@ -140,6 +140,7 @@ EOF
140140
done
141141
print_notice "PHP-FPM Preparing to start with the following plugins enabled: ${php_actual_plugins_enabled}"
142142
else
143+
php_enable_create_sample_php=${PHP_ENABLE_CREATE_SAMPLE_PHP}
143144
print_warn "Enabling Kitchen Sink mode and allowing all plugins to be active"
144145
silent php-ext enable all
145146
fi
@@ -162,7 +163,7 @@ phpfpm_configure_logging() {
162163
;;
163164
esac
164165

165-
sed -i -e "s/<PHP_LOG_LEVEL>/${PHP_LOG_LEVEL}/g" /assets/php-fpm/fpm/php-fpm.conf
166+
update_template /assets/php-fpm/fpm/php-fpm.conf PHP_LOG_LEVEL
166167
}
167168

168169
phpfpm_configure_nginx() {
@@ -191,33 +192,39 @@ phpfpm_configure_nginx() {
191192
phpfpm_configure_server() {
192193
if [ "${PHP_BASE:0:1}" = "5" ] ; then echo "suhosin.executor.include.whitelist = phar" >> /etc/php"${PHP_BASE:0:1}"/php.ini ; fi
193194
truefalse_onoff PHP_DISPLAY_ERRORS
194-
sed -i "s|<DISPLAY_ERRORS>|${PHP_DISPLAY_ERRORS}|g" /assets/php-fpm/fpm/php-fpm.conf
195-
sed -i -e "s#<PHP_LISTEN_PORT>#${PHP_FPM_LISTEN_PORT}#g" /assets/php-fpm/fpm/php-fpm.conf
196-
sed -i -e "s#<MAX_CHILDREN>#${PHP_FPM_MAX_CHILDREN}#g" /assets/php-fpm/fpm/php-fpm.conf
197-
sed -i -e "s#<MAX_EXECUTION_TIME>#${PHP_TIMEOUT}#g" /assets/php-fpm/fpm/php-fpm.conf
198-
sed -i -e "s#<MAX_REQUESTS>#${PHP_FPM_MAX_REQUESTS}#g" /assets/php-fpm/fpm/php-fpm.conf
199-
sed -i -e "s#<MAX_SPARE_SERVERS>#${PHP_FPM_MAX_SPARE_SERVERS}#g" /assets/php-fpm/fpm/php-fpm.conf
200-
sed -i -e "s#<MAX_START_SERVERS>#${PHP_FPM_START_SERVERS}#g" /assets/php-fpm/fpm/php-fpm.conf
201-
sed -i -e "s#<MIN_SPARE_SERVERS>#${PHP_FPM_MIN_SPARE_SERVERS}#g" /assets/php-fpm/fpm/php-fpm.conf
202-
sed -i -e "s#<OUTPUT_BUFFER_SIZE>#${PHP_FPM_OUTPUT_BUFFER_SIZE}#g" /assets/php-fpm/fpm/php-fpm.conf
203-
sed -i -e "s#<PHP_HOST>#${PHP_FPM_HOST}#g" /etc/nginx/snippets/php-fpm.conf
204-
sed -i -e "s#<PHP_LISTEN_PORT>#${PHP_FPM_LISTEN_PORT}#g" /etc/nginx/snippets/php-fpm.conf
205-
sed -i -e "s#<PHP_LOG_LOCATION>#${PHP_LOG_LOCATION}#g" /assets/php-fpm/fpm/php-fpm.conf
206-
sed -i -e "s#<PHP_LOG_ACCESS_FILE>#${PHP_LOG_ACCESS_FILE}#g" /assets/php-fpm/fpm/php-fpm.conf
207-
sed -i -e "s#<PHP_LOG_ERROR_FILE>#${PHP_LOG_ERROR_FILE}#g" /assets/php-fpm/fpm/php-fpm.conf
208-
sed -i -e "s#<PHP_LOG_LIMIT>#${PHP_LOG_LIMIT}#g" /assets/php-fpm/fpm/php-fpm.conf
209-
sed -i -e "s#<PHP_MEMORY_LIMIT>#${PHP_MEMORY_LIMIT}#g" /assets/php-fpm/fpm/php-fpm.conf
210-
sed -i -e "s#<PHP_TIMEOUT>#${PHP_TIMEOUT}#g" /etc/nginx/snippets/php-fpm.conf
211-
sed -i -e "s#<POST_MAX_SIZE>#${PHP_POST_MAX_SIZE}#g" /assets/php-fpm/fpm/php-fpm.conf
212-
sed -i -e "s#<PROCESS_MANAGER>#${PHP_FPM_PROCESS_MANAGER}#g" /assets/php-fpm/fpm/php-fpm.conf
213-
sed -i -e "s#<UPLOAD_MAX_SIZE>#${PHP_UPLOAD_MAX_SIZE}#g" /assets/php-fpm/fpm/php-fpm.conf
214-
sed -i -e "s#apc.shm_size.*#apc.shm_size=${PHP_APC_SHM_SIZE}#g" /assets/php-fpm//mods-available/apcu.ini
215-
sed -i -e "s#opcache.memory_consumption.*#opcache.memory_consumption=$PHP_OPCACHE_MEM_SIZE#g" /assets/php-fpm/mods-available/opcache.ini
216-
sed -i -e "s#memory_limit = .*#memory_limit = ${PHP_MEMORY_LIMIT}#g" /assets/php-fpm/cli/php.ini
217-
sed -i -e "s#max_input_time = .*#max_input_time = ${PHP_TIMEOUT}#g" /assets/php-fpm/cli/php.ini
218-
sed -i -e "s#default_socket_timeout = .*#default_socket_timeout = ${PHP_TIMEOUT}#g" /assets/php-fpm/cli/php.ini
219-
sed -i -e "s#post_max_size = .*#post_max_size = ${PHP_UPLOAD_MAX_SIZE}#g" /assets/php-fpm/cli/php.ini
220-
sed -i -e "s#upload_max_filesize = .*#upload_max_filesize = ${PHP_UPLOAD_MAX_SIZE}#g" /assets/php-fpm/cli/php.ini
195+
update_template /assets/php-fpm/fpm/php-fpm.conf \
196+
NGINX_USER \
197+
NGINX_GROUP \
198+
PHP_DISPLAY_ERRORS \
199+
PHP_FPM_HOST \
200+
PHP_FPM_LISTEN_PORT \
201+
PHP_FPM_LISTEN_PORT \
202+
PHP_FPM_MAX_CHILDREN \
203+
PHP_FPM_MAX_REQUESTS \
204+
PHP_FPM_MAX_SPARE_SERVERS \
205+
PHP_FPM_MIN_SPARE_SERVERS \
206+
PHP_FPM_OUTPUT_BUFFER_SIZE \
207+
PHP_FPM_PROCESS_MANAGER \
208+
PHP_FPM_START_SERVERS \
209+
PHP_LOG_ACCESS_FILE \
210+
PHP_LOG_ERROR_FILE \
211+
PHP_LOG_LIMIT \
212+
PHP_LOG_LOCATION \
213+
PHP_MEMORY_LIMIT \
214+
PHP_POST_MAX_SIZE \
215+
PHP_TIMEOUT \
216+
PHP_UPLOAD_MAX_SIZE
217+
218+
update_template /etc/nginx/snippets/php-fpm.conf PHP_TIMEOUT
219+
220+
sed -i "s#apc.shm_size.*#apc.shm_size=${PHP_APC_SHM_SIZE}#g" /assets/php-fpm//mods-available/apcu.ini
221+
sed -i "s#opcache.memory_consumption.*#opcache.memory_consumption=$PHP_OPCACHE_MEM_SIZE#g" /assets/php-fpm/mods-available/opcache.ini
222+
sed -i -e "s#memory_limit = .*#memory_limit = ${PHP_MEMORY_LIMIT}#g" \
223+
-e "s#max_input_time = .*#max_input_time = ${PHP_TIMEOUT}#g" \
224+
-e "s#default_socket_timeout = .*#default_socket_timeout = ${PHP_TIMEOUT}#g" \
225+
-e "s#post_max_size = .*#post_max_size = ${PHP_UPLOAD_MAX_SIZE}#g" \
226+
-e "s#upload_max_filesize = .*#upload_max_filesize = ${PHP_UPLOAD_MAX_SIZE}#g" \
227+
/assets/php-fpm/cli/php.ini
221228

222229
if [ -n "${PHP_IDE_CONFIG}" ]; then
223230
if [[ "${PHP_IDE_CONFIG}" = \"* ]] || [[ "${PHP_IDE_CONFIG}" = \'* ]] ; then
@@ -230,9 +237,8 @@ phpfpm_configure_server() {
230237
sed -i -e "s#date.timezone = .*#date.timezone = $(cat /etc/timezone)#g" /assets/php-fpm/cli/php.ini
231238
sed -i -e "s#date.timezone = .*#date.timezone = $(cat /etc/timezone)#g" /assets/php-fpm/fpm/php.ini
232239
}
233-
234240
phpfpm_create_default_page() {
235-
if var_true "${PHP_ENABLE_CREATE_SAMPLE_PHP}" ; then
241+
if var_true "${php_enable_create_sample_php}" ; then
236242
if [ ! -f "${NGINX_WEBROOT}"/index.php ] ; then
237243
print_notice "Creating sample index.php"
238244
mkdir -p "${NGINX_WEBROOT}"

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
error_log = <PHP_LOG_LOCATION>/<PHP_LOG_ERROR_FILE>
2-
log_level = <PHP_LOG_LEVEL>
3-
log_limit = <PHP_LOG_LIMIT>
1+
error_log = {{PHP_LOG_LOCATION}}/{{PHP_LOG_ERROR_FILE}}
2+
log_level = {{PHP_LOG_LEVEL}}
3+
log_limit = {{PHP_LOG_LIMIT}}
44

55
[www]
6-
listen = 0.0.0.0:<PHP_LISTEN_PORT>
7-
listen.owner = nginx
8-
listen.group = www-data
6+
listen = 0.0.0.0:{{PHP_FPM_LISTEN_PORT}}
7+
listen.owner = {{NGINX_USER}}
8+
listen.group = {{NGINX_GROUP}}
99

10-
access.log = <PHP_LOG_LOCATION>/<PHP_LOG_ACCESS_FILE>
10+
access.log = {{PHP_LOG_LOCATION}}/{{PHP_LOG_ACCESS_FILE}}
1111

12-
pm = <PROCESS_MANAGER>
13-
pm.max_children = <MAX_CHILDREN>
14-
pm.start_servers = <MAX_START_SERVERS>
15-
pm.min_spare_servers = <MIN_SPARE_SERVERS>
16-
pm.max_spare_servers = <MAX_SPARE_SERVERS>
12+
pm = {{PHP_FPM_PROCESS_MANAGER}}
13+
pm.max_children = {{PHP_FPM_MAX_CHILDREN}}
14+
pm.start_servers = {{PHP_FPM_START_SERVERS}}
15+
pm.min_spare_servers = {{PHP_FPM_MIN_SPARE_SERVERS}}
16+
pm.max_spare_servers = {{PHP_FPM_MAX_SPARE_SERVERS}}
1717
pm.status_path = /php-fpm_status
1818
ping.path = /ping
1919

2020
pm.process_idle_timeout = 10s
21-
pm.max_requests = <MAX_REQUESTS>
22-
php_admin_value[log_errors_max_len] = <PHP_LOG_LIMIT>
23-
php_admin_value[max_execution_time] = <MAX_EXECUTION_TIME>
21+
pm.max_requests = {{PHP_FPM_MAX_REQUESTS}}
22+
php_admin_value[log_errors_max_len] = {{PHP_LOG_LIMIT}}
23+
php_admin_value[max_execution_time] = {{PHP_TIMEOUT}}
2424
php_admin_value[max_input_nesting_level] = 256
2525
php_admin_value[max_input_vars] = 10000
26-
php_admin_value[memory_limit] = <PHP_MEMORY_LIMIT>
26+
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] = <OUTPUT_BUFFER_SIZE>
30-
php_admin_value[post_max_size] = <POST_MAX_SIZE>
31-
php_admin_value[upload_max_filesize] = <UPLOAD_MAX_SIZE>
32-
php_flag[display_errors] = <DISPLAY_ERRORS>
29+
php_admin_value[output_buffering] = {{PHP_FPM_OUTPUT_BUFFER_SIZE}}
30+
php_admin_value[post_max_size] = {{PHP_POST_MAX_SIZE}}
31+
php_admin_value[upload_max_filesize] = {{PHP_UPLOAD_MAX_SIZE}}
32+
php_flag[display_errors] = {{PHP_DISPLAY_ERRORS}}
3333
catch_workers_output = yes
3434

3535
env[PATH] = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

‎install/etc/cont-init.d/20-php-fpm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ if [ ! -f "/tmp/.container/container-restart" ] ; then
4242
phpfpm_configure_extensions
4343
phpfpm_configure_authentication
4444
phpfpm_configure_logging
45-
if [ "${PHP_FPM_CONTAINER_MODE,,}" != "php-fpm" ] ; then phpfpm_configure_nginx ; fi
46-
if [ "${PHP_FPM_CONTAINER_MODE,,}" != "php-fpm" ] ; then phpfpm_create_default_page ; fi
45+
if [[ "${PHP_FPM_CONTAINER_MODE,,}" == *"nginx"* ]] ; then phpfpm_configure_nginx ; fi
46+
if [[ "${PHP_FPM_CONTAINER_MODE,,}" == *"php-fpm"* ]] ; then phpfpm_create_default_page ; fi
4747
if var_true "${NGINX_ENABLE_APPLICATION_CONFIGURATION}"; then phpfpm_configure_site_default ; fi
4848
phpfpm_post_init
4949
fi

‎install/etc/nginx/snippets/php-fpm.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fastcgi_pass php-fpm-upstream;
2-
fastcgi_read_timeout <PHP_TIMEOUT>;
3-
fastcgi_send_timeout <PHP_TIMEOUT>;
2+
fastcgi_read_timeout {{PHP_TIMEOUT}};
3+
fastcgi_send_timeout {{PHP_TIMEOUT}};
44
proxy_http_version 1.1;
55
proxy_set_header Connection "";

0 commit comments

Comments
 (0)