SchultesDev/nginx-php-fpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

closes #240 closes !250

Browse Source
This commit is contained in:
Ric Harvey
2019-03-09 22:30:25 +00:00
parent d99fb28cd7
commit 53d37e1b7c
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -10,7 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on
### Versioning ### Versioning
| Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | | 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) For other tags please see: [versioning](https://gitlab.com/ric_harvey/nginx-php-fpm/blob/master/docs/versioning.md)

1
docs/versioning.md
View File

@@ -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.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.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.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 #### PHP 7.2

9
scripts/start.sh
View File

@@ -92,9 +92,9 @@ fi
# Display PHP error's or not # Display PHP error's or not
if [[ "$ERRORS" != "1" ]] ; then 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 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 fi
# Display Version Details or not # Display Version Details or not
@@ -123,7 +123,10 @@ if [ -f /etc/nginx/sites-available/default-ssl.conf ]; then
fi fi
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 if [ ! -z "$PHP_ERRORS_STDERR" ]; then
echo "log_errors = On" >> /usr/local/etc/php/conf.d/docker-vars.ini 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 echo "error_log = /dev/stderr" >> /usr/local/etc/php/conf.d/docker-vars.ini