Skip to content

Commit 4a80624

Browse files
authored
Merge pull request #23 from million12/php74
Updated php to 7.4
2 parents bf4046f + 6b0b1bc commit 4a80624

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ENV \
88
GIT_VERSION=2.24.1 \
99
PHP_MEMCACHED=3.1.5 \
1010
PHP_REDIS=5.1.1 \
11-
PHP_VERSION=73
11+
PHP_VERSION=74
1212

1313
# Add install scripts needed by the next RUN command
1414
ADD container-files/config/install* /config/

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ docker container with Nginx + PHP-FPM combo.
2121
For different PHP versions, look up different branches of this repository.
2222
On Docker Hub you can find them under different tags:
2323

24+
* `million12/nginx-php:php74` - PHP 7.4 # built from `php74` branch
2425
* `million12/nginx-php:php73` - PHP 7.3 # built from `php73` branch
2526
* `million12/nginx-php:php70` - PHP 7.0 # built from `php70` branch
2627
* `million12/nginx-php:php56` - PHP 5.6 # built from `php56` branch
@@ -37,7 +38,7 @@ to that location to have it executed with PHP.
3738

3839
#### - PHP-FPM
3940

40-
**PHP 7.3** is up & running for default vhost. As soon as .php file is requested, the request will be redirected to PHP upstream. See [/etc/nginx/conf.d/php-location.conf](container-files/etc/nginx/conf.d/php-location.conf).
41+
**PHP 7.4** is up & running for default vhost. As soon as .php file is requested, the request will be redirected to PHP upstream. See [/etc/nginx/conf.d/php-location.conf](container-files/etc/nginx/conf.d/php-location.conf).
4142

4243
File [/etc/nginx/fastcgi_params](container-files/etc/nginx/fastcgi_params) has improved configuration to avoid repeating same config options for each vhost. This config works well with most PHP applications (e.g. Symfony2, TYPO3, Wordpress, Drupal).
4344

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[program:php-fpm]
2-
command = /opt/remi/php73/root/sbin/php-fpm --fpm-config /etc/php-fpm.conf
2+
command = /opt/remi/php74/root/sbin/php-fpm --fpm-config /etc/php-fpm.conf
33
autorestart = true
44
stdout_logfile = /data/logs/php-fpm.log
55
stderr_logfile = /data/logs/php-fpm.log

0 commit comments

Comments
 (0)