Skip to content

Commit ac66d58

Browse files
committed
[php] Leaf update to PHP 8.5
1 parent 96d08ff commit ac66d58

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

frameworks/PHP/leaf/leaf-workerman.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
77
apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
88

99
RUN apt-get update -yqq > /dev/null && apt-get install -yqq git \
10-
php8.4-cli php8.4-mysql php8.4-mbstring php8.4-xml php8.4-curl php8.4-zip > /dev/null
10+
php8.5-cli php8.5-mysql php8.5-mbstring php8.5-xml php8.5-curl php8.5-zip > /dev/null
1111

1212
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1313

14-
RUN apt-get install -y libevent-dev php8.4-dev > /dev/null \
14+
RUN apt-get install -y libevent-dev php8.5-dev > /dev/null \
1515
&& pecl install event-3.1.4 > /dev/null \
16-
&& echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
16+
&& echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini
1717

18-
COPY --link deploy/conf/cli-php.ini /etc/php/8.4/cli/conf.d/20-adapterman.ini
18+
COPY --link deploy/conf/cli-php.ini /etc/php/8.5/cli/conf.d/20-adapterman.ini
1919

2020
WORKDIR /leaf
2121
COPY --link . .

frameworks/PHP/leaf/leaf.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
77
apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
88

99
RUN apt-get install -yqq nginx git unzip \
10-
php8.4-cli php8.4-fpm php8.4-mysql php8.4-xml php8.4-curl php8.4-zip > /dev/null
10+
php8.5-cli php8.5-fpm php8.5-mysql php8.5-xml php8.5-curl php8.5-zip > /dev/null
1111

1212
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1313

14-
COPY --link deploy/conf/* /etc/php/8.4/fpm/
14+
COPY --link deploy/conf/* /etc/php/8.5/fpm/
1515

1616
WORKDIR /leaf
1717
COPY --link . .
1818

19-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
19+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
2020

2121
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
2222

2323
RUN chmod -R 777 /leaf
2424

2525
EXPOSE 8080
2626

27-
CMD service php8.4-fpm start && \
27+
CMD service php8.5-fpm start && \
2828
nginx -c /leaf/deploy/nginx.conf

frameworks/PHP/leaf/server.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ class HeaderDate
3939

4040
public static function init(): void
4141
{
42-
self::$date = self::NAME . gmdate(DATE_RFC7231);
42+
self::$date = self::NAME . gmdate('D, d M Y H:i:s \G\M\T');
4343
Timer::add(1, static function() {
44-
self::$date = self::NAME . gmdate(DATE_RFC7231);
44+
self::$date = self::NAME . gmdate('D, d M Y H:i:s \G\M\T');
4545
});
4646
}
4747
}

0 commit comments

Comments
 (0)