diff --git a/7.3/Dockerfile b/7.3/Dockerfile index 1d4b9b5..eb84f24 100644 --- a/7.3/Dockerfile +++ b/7.3/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine-3.12-1.3.2 +FROM bcgdesign/nginx:alpine-3.12-1.4.1 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \ diff --git a/7.3/php-fpm/run b/7.3/php-fpm/run index 0ea06a6..916b5b3 100644 --- a/7.3/php-fpm/run +++ b/7.3/php-fpm/run @@ -9,5 +9,5 @@ set -euo pipefail #====================================================================================================================== VERSION=$(php -r "echo PHP_VERSION;") -_echo "Starting PHP v${VERSION} - FastCGI Process Manager" +bcg-echo "Starting PHP v${VERSION} - FastCGI Process Manager" php-fpm7 -F diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 25e553e..74ba0eb 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine-3.13-1.3.2 +FROM bcgdesign/nginx:alpine-3.13-1.4.1 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \ diff --git a/7.4/php-fpm/run b/7.4/php-fpm/run index 0ea06a6..916b5b3 100644 --- a/7.4/php-fpm/run +++ b/7.4/php-fpm/run @@ -9,5 +9,5 @@ set -euo pipefail #====================================================================================================================== VERSION=$(php -r "echo PHP_VERSION;") -_echo "Starting PHP v${VERSION} - FastCGI Process Manager" +bcg-echo "Starting PHP v${VERSION} - FastCGI Process Manager" php-fpm7 -F diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 017608e..9964623 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine-3.13-1.3.2 +FROM bcgdesign/nginx:alpine-3.13-1.4.1 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \ diff --git a/8.0/php-fpm/run b/8.0/php-fpm/run index 4d199d2..0264fc9 100644 --- a/8.0/php-fpm/run +++ b/8.0/php-fpm/run @@ -9,5 +9,5 @@ set -euo pipefail #====================================================================================================================== VERSION=$(php -r "echo PHP_VERSION;") -_echo "Starting PHP v${VERSION} - FastCGI Process Manager" +bcg-echo "Starting PHP v${VERSION} - FastCGI Process Manager" php-fpm8 -F diff --git a/VERSION b/VERSION index d5e98f7..e21e727 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.2 \ No newline at end of file +1.4.0 \ No newline at end of file diff --git a/overlay/etc/cont-init.d/20-php-fpm-config b/overlay/etc/cont-init.d/20-php-fpm-config index 46cc7be..ea4c4b3 100644 --- a/overlay/etc/cont-init.d/20-php-fpm-config +++ b/overlay/etc/cont-init.d/20-php-fpm-config @@ -7,7 +7,7 @@ set -euo pipefail # Optionally override configuration #====================================================================================================================== -_echo "Setting www.conf configuration values..." +bcg-echo "Setting www.conf configuration values..." declare -A VALUES VALUES["user"]="www" @@ -17,4 +17,4 @@ VALUES["log_level"]="${PHP_FPM_LOG_LEVEL-}" source /etc/functions/replace.sh replace VALUES "${PHP_DIR}/php-fpm.d/www.conf" -_done +bcg-done diff --git a/overlay/etc/cont-init.d/21-php-ini-download b/overlay/etc/cont-init.d/21-php-ini-download index 8046e09..1ca5e40 100644 --- a/overlay/etc/cont-init.d/21-php-ini-download +++ b/overlay/etc/cont-init.d/21-php-ini-download @@ -9,20 +9,20 @@ set -euo pipefail DOWNLOADED="${PHP_DIR}/php.ini-${PHP_INI}.downloaded" if [ -e ${DOWNLOADED} ] ; then - _ok "php.ini already downloaded." + bcg-ok "php.ini already downloaded." exit 0 fi if [ "${PHP_INI}" = "development" ] || [ "${PHP_INI}" = "production" ] ; then URL="https://raw.githubusercontent.com/php/php-src/master/php.ini-${PHP_INI}" - _echo "Downloading php.ini from ${URL}..." + bcg-echo "Downloading php.ini from ${URL}..." wget -O "${PHP_DIR}/php.ini" ${URL} \ && touch ${DOWNLOADED} - _done + bcg-done else - _error "Unsupported PHP_INI value: '${PHP_INI}'." + bcg-error "Unsupported PHP_INI value: '${PHP_INI}'." fi diff --git a/overlay/etc/cont-init.d/22-php-ini-config b/overlay/etc/cont-init.d/22-php-ini-config index 1a421f9..21b91ef 100644 --- a/overlay/etc/cont-init.d/22-php-ini-config +++ b/overlay/etc/cont-init.d/22-php-ini-config @@ -7,7 +7,7 @@ set -euo pipefail # Optionally override configuration #====================================================================================================================== -_echo "Setting php.ini configuration values..." +bcg-echo "Setting php.ini configuration values..." declare -A VALUES VALUES["display_errors"]="${PHP_INI_DISPLAY_ERRORS-}" @@ -22,4 +22,4 @@ VALUES["upload_max_filesize"]="${PHP_INI_MAX_UPLOAD-}" source /etc/functions/replace.sh replace VALUES "${PHP_DIR}/php.ini" -_done +bcg-done diff --git a/overlay/etc/functions/replace.sh b/overlay/etc/functions/replace.sh index 3ee7dd5..268d064 100644 --- a/overlay/etc/functions/replace.sh +++ b/overlay/etc/functions/replace.sh @@ -18,7 +18,7 @@ replace () { for KEY in ${!A[@]} ; do VAL=${A[$KEY]} if [ ! -z "${VAL}" ] ; then - #_echo " - ${KEY}=${VAL}" + #bcg-echo " - ${KEY}=${VAL}" sed -i "s|^;\?${KEY}.*$|${KEY} = ${VAL}|i" ${FILE} fi done diff --git a/overlay/etc/services.d/php-error-log/run b/overlay/etc/services.d/php-error-log/run index 19d724d..4cf36f8 100644 --- a/overlay/etc/services.d/php-error-log/run +++ b/overlay/etc/services.d/php-error-log/run @@ -7,4 +7,4 @@ set -euo pipefail # Forward PHP errors to Docker #====================================================================================================================== -_forward "php-error-log" "${PHP_INI_ERROR_LOG}" +bcg-forward "php-error-log" "${PHP_INI_ERROR_LOG}" diff --git a/overlay/etc/services.d/php-fpm/finish b/overlay/etc/services.d/php-fpm/finish index 6b1e755..02c787d 100644 --- a/overlay/etc/services.d/php-fpm/finish +++ b/overlay/etc/services.d/php-fpm/finish @@ -7,4 +7,4 @@ set -euo pipefail # Use base executable to terminate all services #====================================================================================================================== -_terminate +bcg-terminate diff --git a/overlay/usr/local/bin/php-clean-sessions b/overlay/usr/local/bin/php-clean-sessions index 5b46afb..7ef595e 100644 --- a/overlay/usr/local/bin/php-clean-sessions +++ b/overlay/usr/local/bin/php-clean-sessions @@ -7,10 +7,10 @@ set -euo pipefail # Hat-tip https://www.getpagespeed.com/server-setup/php/cleanup-php-sessions-like-a-pro #====================================================================================================================== -_echo "Cleaning PHP sessions..." +bcg-echo "Cleaning PHP sessions..." php \ -d session.gc_probability=1 \ -d session.gc_divisor=1 \ -d session.gc_maxlifetime=${PHP_SESSION_MAX_LIFETIME} \ -r "session_start(); session_destroy();" -_done +bcg-done