Skip to content

Commit 6f8f4a8

Browse files
Merge pull request #9513 from joanhey/slim-php8.4
[php] Slim update to PHP/8.4
2 parents a417d50 + 4d19d45 commit 6f8f4a8

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

frameworks/PHP/slim/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"slim/php-view": "3.2.0",
55
"slim/psr7": "1.*",
66
"slim/http": "1.*",
7-
"php-di/php-di": "^6.4"
7+
"php-di/php-di": "^7"
88
},
99
"autoload": {
1010
"psr-4": {

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

Lines changed: 1 addition & 1 deletion
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/slim/slim-workerman-pgsql.dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

@@ -8,17 +8,17 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
88
RUN apt-get upgrade -yqq > /dev/null
99

1010
RUN apt-get install -yqq git \
11-
php8.3-cli php8.3-pgsql php8.3-mbstring php8.3-xml php8.3-curl > /dev/null
11+
php8.4-cli php8.4-pgsql php8.4-mbstring php8.4-xml php8.4-curl > /dev/null
1212

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

15-
RUN apt-get install -y php-pear php8.3-dev libevent-dev > /dev/null
16-
RUN pecl install event-3.1.3 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
15+
RUN apt-get install -y php-pear php8.4-dev libevent-dev > /dev/null
16+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
1717

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

20-
ADD ./ /slim
2120
WORKDIR /slim
21+
COPY --link . .
2222

2323
EXPOSE 8080
2424

frameworks/PHP/slim/slim-workerman.dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

@@ -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 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 > /dev/null
10+
php8.4-cli php8.4-mysql php8.4-mbstring php8.4-xml php8.4-curl > /dev/null
1111

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

14-
RUN apt-get install -y php-pear php8.3-dev libevent-dev > /dev/null
15-
RUN pecl install event-3.1.3 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
14+
RUN apt-get install -y php-pear php8.4-dev libevent-dev > /dev/null
15+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
1616

17-
COPY deploy/conf/cli-php.ini /etc/php/8.3/cli/php.ini
17+
COPY deploy/conf/cli-php.ini /etc/php/8.4/cli/php.ini
1818

19-
ADD ./ /slim
2019
WORKDIR /slim
20+
COPY --link . .
2121

2222
EXPOSE 8080
2323

2424
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
25-
RUN composer require joanhey/adapterman:^0.6 --quiet
25+
RUN composer require joanhey/adapterman:^0.7 --quiet
2626

2727

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

frameworks/PHP/slim/slim.dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

@@ -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 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql php8.3-xml php8.3-curl > /dev/null
10+
php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql php8.4-xml php8.4-curl > /dev/null
1111

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

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

16-
ADD ./ /slim
1716
WORKDIR /slim
17+
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 /slim
2424

2525
EXPOSE 8080
2626

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

0 commit comments

Comments
 (0)