Skip to content

Commit ed0bbf4

Browse files
Merge pull request #9531 from joanhey/leaf-php8.4
[php] Leaf update to PHP/8.4
2 parents 4f7f619 + 90837f3 commit ed0bbf4

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

frameworks/PHP/leaf/deploy/conf/cli-php.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ memory_limit = 512M
1313
opcache.jit_buffer_size = 128M
1414
opcache.jit = tracing
1515

16-
disable_functions=header,header_remove,headers_sent,http_response_code,setcookie,session_create_id,session_id,session_name,session_save_path,session_status,session_start,session_write_close,session_regenerate_id,set_time_limit
16+
disable_functions=header,header_remove,headers_sent,headers_list,http_response_code,setcookie,session_create_id,session_id,session_name,session_save_path,session_status,session_start,session_write_close,session_regenerate_id,session_unset,session_get_cookie_params,session_set_cookie_params,set_time_limit

frameworks/PHP/leaf/leaf-workerman.dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ 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.3-cli php8.3-mysql php8.3-mbstring php8.3-xml php8.3-curl php8.3-zip > /dev/null
10+
php8.4-cli php8.4-mysql php8.4-mbstring php8.4-xml php8.4-curl php8.4-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.3-dev > /dev/null \
14+
RUN apt-get install -y libevent-dev php8.4-dev > /dev/null \
1515
&& pecl install event-3.1.4 > /dev/null \
16-
&& echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
16+
&& echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
1717

18-
COPY --link deploy/conf/cli-php.ini /etc/php/8.3/cli/php.ini
18+
COPY --link deploy/conf/cli-php.ini /etc/php/8.4/cli/php.ini
1919

2020
WORKDIR /leaf
2121
COPY --link . .
2222

2323
EXPOSE 8080
2424

2525
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
26-
RUN composer require joanhey/adapterman:^0.6 --quiet
26+
RUN composer require joanhey/adapterman:^0.7 --quiet
2727

2828

2929
RUN sed -i 's|app()->run(); //| //$app->run(); //|g' index.php

frameworks/PHP/leaf/leaf.dockerfile

+4-4
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.3-cli php8.3-fpm php8.3-mysql php8.3-xml php8.3-curl php8.3-zip > /dev/null
10+
php8.4-cli php8.4-fpm php8.4-mysql php8.4-xml php8.4-curl php8.4-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.3/fpm/
14+
COPY --link deploy/conf/* /etc/php/8.4/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.3/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.4/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.3-fpm start && \
27+
CMD service php8.4-fpm start && \
2828
nginx -c /leaf/deploy/nginx.conf

0 commit comments

Comments
 (0)