Skip to content

Commit 7c714be

Browse files
authored
[php] Laravel update to PHP 8.5 (#10323)
* [php] Laravel update to PHP 8.5 * [php] Laravel update to PHP 8.5 * Fix Laravel-s * Small changes * Enable OPCache in Laravel-S
1 parent 2219f26 commit 7c714be

File tree

7 files changed

+28
-21
lines changed

7 files changed

+28
-21
lines changed

frameworks/PHP/laravel/laravel-octane-frankenphp.dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
FROM dunglas/frankenphp
1+
FROM dunglas/frankenphp:php8.5
22

3-
RUN apt-get update -yqq && apt-get install libicu-dev unzip -y
3+
ARG DEBIAN_FRONTEND=noninteractive
4+
5+
RUN apt-get update -yqq && apt-get install libicu-dev unzip -y > /dev/null
46
RUN install-php-extensions \
57
intl \
68
pcntl \

frameworks/PHP/laravel/laravel-ripple.dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM php:8.3-cli
1+
FROM php:8.5-cli
2+
3+
ARG DEBIAN_FRONTEND=noninteractive
24

35
RUN apt-get update -yqq >> /dev/null
46
RUN apt-get install -y libevent-dev \
@@ -9,14 +11,14 @@ RUN apt-get install -y libevent-dev \
911
unzip >> /dev/null
1012

1113
RUN docker-php-ext-install pdo_mysql \
12-
opcache \
14+
intl \
1315
posix \
1416
pcntl \
1517
sockets >> /dev/null
1618

1719
RUN pecl install event >> /dev/null
1820

19-
RUN docker-php-ext-enable intl pdo_mysql opcache posix pcntl sockets
21+
RUN docker-php-ext-enable intl pdo_mysql posix pcntl sockets
2022
RUN docker-php-ext-enable --ini-name zz-event.ini event
2123
RUN echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
2224
RUN echo "opcache.jit=1205" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini

frameworks/PHP/laravel/laravel-roadrunner.dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
FROM php:8.4-cli
1+
FROM php:8.5-cli
2+
3+
ARG DEBIAN_FRONTEND=noninteractive
4+
25
RUN apt-get update -yqq && \
36
apt-get install -yqq libpq-dev libicu-dev > /dev/null && \
4-
docker-php-ext-install intl pdo_mysql pcntl opcache sockets > /dev/null
7+
docker-php-ext-install intl pdo_mysql pcntl sockets > /dev/null
58

69
RUN echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
710
RUN echo "opcache.jit=1205" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
@@ -24,7 +27,7 @@ RUN pecl install protobuf > /dev/null && echo "extension=protobuf.so" > /usr/loc
2427
COPY --from=composer/composer:latest-bin --link /composer /usr/local/bin/composer
2528

2629
RUN composer require laravel/octane --update-no-dev --no-scripts --quiet
27-
RUN php artisan octane:install --server="roadrunner"
30+
RUN php artisan octane:install --server="roadrunner" > /dev/null
2831
RUN php artisan optimize
2932

3033
RUN export WORKERS=$((1*$(nproc)))

frameworks/PHP/laravel/laravel-swoole.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM phpswoole/swoole:php8.4
22

3-
RUN apt-get update -yqq && apt-get install libicu-dev -y
4-
RUN docker-php-ext-install intl pcntl opcache> /dev/null
3+
RUN apt-get update -yqq && apt-get install libicu-dev -y > /dev/null
4+
RUN docker-php-ext-install intl pcntl opcache > /dev/null
55
RUN echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
66
RUN echo "opcache.jit=1205" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
77
RUN echo "opcache.jit_buffer_size=128M" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini

frameworks/PHP/laravel/laravel-workerman.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /de
66
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
apt-get install -yqq git unzip \
9-
php8.4-cli php8.4-mysql php8.4-mbstring php8.4-xml php8.4-intl php8.4-curl > /dev/null
9+
php8.5-cli php8.5-mysql php8.5-mbstring php8.5-xml php8.5-intl php8.5-curl > /dev/null
1010

1111
COPY --from=composer --link /usr/bin/composer /usr/local/bin/composer
1212

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

1616
WORKDIR /laravel
1717
COPY --link . .
@@ -25,7 +25,7 @@ RUN mkdir -p bootstrap/cache \
2525
RUN composer require joanhey/adapterman --update-no-dev --no-scripts --quiet
2626
RUN php artisan optimize
2727

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

3030
EXPOSE 8080
3131

frameworks/PHP/laravel/laravel.dockerfile

Lines changed: 5 additions & 5 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 install -yqq nginx git unzip \
10-
php8.4-bcmath php8.4-cli php8.4-fpm php8.4-mysql php8.4-mbstring php8.4-xml php8.4-curl php8.4-intl > /dev/null
10+
php8.5-bcmath php8.5-cli php8.5-fpm php8.5-mysql php8.5-mbstring php8.5-xml php8.5-curl php8.5-intl > /dev/null
1111

1212
COPY --from=composer --link /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
WORKDIR /laravel
1616
COPY --link . .
1717

18-
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;
18+
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;
1919

2020
RUN mkdir -p bootstrap/cache \
2121
storage/logs \
@@ -29,7 +29,7 @@ RUN php artisan optimize
2929
EXPOSE 8080
3030

3131
# Uncomment next line for Laravel console error logging to be viewable in docker logs
32-
# RUN echo "catch_workers_output = yes" >> /etc/php/8.4/fpm/php-fpm.conf
32+
# RUN echo "catch_workers_output = yes" >> /etc/php/8.5/fpm/php-fpm.conf
3333

34-
CMD service php8.4-fpm start && \
34+
CMD service php8.5-fpm start && \
3535
nginx -c /laravel/deploy/nginx.conf

frameworks/PHP/laravel/server-man.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
$http_worker->reusePort = true;
1414
$http_worker->name = 'AdapterMan-Laravel';
1515
$http_worker->onWorkerStart = static function () {
16-
Header::$date = gmdate(DATE_RFC7231);
16+
Header::$date = gmdate('D, d M Y H:i:s \G\M\T');
1717
Timer::add(1, function() {
18-
Header::$date = gmdate(DATE_RFC7231);
18+
Header::$date = gmdate('D, d M Y H:i:s \G\M\T');
1919
});
2020
//init();
2121
require __DIR__.'/start.php';

0 commit comments

Comments
 (0)