diff --git a/README.md b/README.md index 1d97b63..60c065d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on ### Versioning | Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | |-----|-------|-----|--------|--------| -| latest/1.6.2 | Master Branch |1.14.2 | 7.3.3 | 3.9 | +| latest/1.6.3 | Master Branch |1.14.2 | 7.3.3 | 3.9 | For other tags please see: [versioning](https://gitlab.com/ric_harvey/nginx-php-fpm/blob/master/docs/versioning.md) diff --git a/docs/versioning.md b/docs/versioning.md index 777ab10..8c071ae 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -20,6 +20,7 @@ The latest tag will always follow the master branch in git. the other versions w | 1.6.0 | 7.3.2 |1.14.2 | 3.9 | 0.3.8 | | 1.6.1 | 7.3.2 |1.14.2 | 3.9 | 0.3.9 | | 1.6.2 | 7.3.3 |1.14.2 | 3.9 | 0.3.10 | +| 1.6.3 | 7.3.3 |1.14.2 | 3.9 | 0.3.11 | #### PHP 7.2 diff --git a/scripts/start.sh b/scripts/start.sh index 61c7e2d..b45f7ea 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -92,9 +92,9 @@ fi # Display PHP error's or not if [[ "$ERRORS" != "1" ]] ; then - echo php_flag[display_errors] = off >> /usr/local/etc/php-fpm.conf + echo php_flag[display_errors] = off >> /usr/local/etc/php-fpm.d/www.conf else - echo php_flag[display_errors] = on >> /usr/local/etc/php-fpm.conf + echo php_flag[display_errors] = on >> /usr/local/etc/php-fpm.d/www.conf fi # Display Version Details or not @@ -123,7 +123,10 @@ if [ -f /etc/nginx/sites-available/default-ssl.conf ]; then fi fi -#Display errors in docker logs +# Set the desired timezone +echo date.timezone=$(cat /etc/TZ) > /usr/local/etc/php/conf.d/timezone.ini + +# Display errors in docker logs if [ ! -z "$PHP_ERRORS_STDERR" ]; then echo "log_errors = On" >> /usr/local/etc/php/conf.d/docker-vars.ini echo "error_log = /dev/stderr" >> /usr/local/etc/php/conf.d/docker-vars.ini