mirror of
https://github.com/danog/php.git
synced 2025-01-22 04:51:20 +01:00
Update to 7.1.0RC6
This commit is contained in:
parent
c80266c22a
commit
aa0c2ccbb2
@ -126,7 +126,7 @@ RUN set -ex \
|
|||||||
sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
|
sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
|
||||||
cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
|
cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
|
||||||
else \
|
else \
|
||||||
# PHP 5.x don't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
|
# PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
|
||||||
mkdir php-fpm.d; \
|
mkdir php-fpm.d; \
|
||||||
cp php-fpm.conf.default php-fpm.d/www.conf; \
|
cp php-fpm.conf.default php-fpm.d/www.conf; \
|
||||||
{ \
|
{ \
|
||||||
|
@ -136,7 +136,7 @@ RUN set -ex \
|
|||||||
sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
|
sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
|
||||||
cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
|
cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
|
||||||
else \
|
else \
|
||||||
# PHP 5.x don't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
|
# PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
|
||||||
mkdir php-fpm.d; \
|
mkdir php-fpm.d; \
|
||||||
cp php-fpm.conf.default php-fpm.d/www.conf; \
|
cp php-fpm.conf.default php-fpm.d/www.conf; \
|
||||||
{ \
|
{ \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user