Skip to content

Commit 9c9fb2d

Browse files
joanheyjoanhey
authored
[php] Update to 8.1 (#6896)
1 parent a9143ab commit 9c9fb2d

6 files changed

+27
-27
lines changed

‎frameworks/PHP/php/benchmark_config.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"database": "MySQL",
1515
"framework": "None",
1616
"language": "PHP",
17-
"flavor": "PHP7",
17+
"flavor": "PHP8.1",
1818
"orm": "Raw",
1919
"platform": "FPM/FastCGI",
2020
"webserver": "nginx",
@@ -37,7 +37,7 @@
3737
"database": "MySQL",
3838
"framework": "None",
3939
"language": "PHP",
40-
"flavor": "PHP7",
40+
"flavor": "PHP8.1",
4141
"orm": "Raw",
4242
"platform": "FPM/FastCGI",
4343
"webserver": "nginx",
@@ -58,7 +58,7 @@
5858
"database": "Postgres",
5959
"framework": "None",
6060
"language": "PHP",
61-
"flavor": "PHP7",
61+
"flavor": "PHP8.1",
6262
"orm": "Raw",
6363
"platform": "FPM/FastCGI",
6464
"webserver": "nginx",
@@ -81,7 +81,7 @@
8181
"database": "MySQL",
8282
"framework": "None",
8383
"language": "PHP",
84-
"flavor": "PHP7",
84+
"flavor": "PHP8.1",
8585
"orm": "Raw",
8686
"platform": "FPM/FastCGI",
8787
"webserver": "h2o",
@@ -127,7 +127,7 @@
127127
"database": "MySQL",
128128
"framework": "None",
129129
"language": "PHP",
130-
"flavor": "PHP7",
130+
"flavor": "PHP8.1",
131131
"orm": "Raw",
132132
"platform": "FPM/FastCGI",
133133
"webserver": "nginx",

‎frameworks/PHP/php/php-h2o.dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ RUN apt-get update > /dev/null && \
1212
### Install php
1313
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null
1414
RUN apt-get update -yqq > /dev/null && \
15-
apt-get install -yqq php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql > /dev/null
15+
apt-get install -yqq php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql > /dev/null
1616

17-
COPY deploy/conf/* /etc/php/8.0/fpm/
17+
COPY deploy/conf/* /etc/php/8.1/fpm/
1818

19-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.0/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.1/fpm/php-fpm.conf ; fi;
2020

2121
### Install h2o
2222

@@ -35,5 +35,5 @@ EXPOSE 8080
3535

3636
CMD export WORKERS=$(( 2 * $(nproc) )) && \
3737
sed -i "s/num-threads: x/num-threads: $WORKERS/g" /deploy/h2o.conf && \
38-
service php8.0-fpm start && \
38+
service php8.1-fpm start && \
3939
/h2o/bin/h2o -c /deploy/h2o.conf

‎frameworks/PHP/php/php-pgsql-raw.dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ ARG DEBIAN_FRONTEND=noninteractive
55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-pgsql > /dev/null
8+
apt-get install -yqq nginx git unzip php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-pgsql > /dev/null
99

10-
COPY deploy/conf/* /etc/php/8.0/fpm/
10+
COPY deploy/conf/* /etc/php/8.1/fpm/
1111

1212
ADD ./ /php
1313
WORKDIR /php
@@ -17,11 +17,11 @@ RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" dbquery.php
1717
RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" fortune.php
1818
RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" updateraw.php
1919

20-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.0/fpm/php-fpm.conf ; fi;
20+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.1/fpm/php-fpm.conf ; fi;
2121

2222
RUN chmod -R 777 /php
2323

2424
EXPOSE 8080
2525

26-
CMD service php8.0-fpm start && \
26+
CMD service php8.1-fpm start && \
2727
nginx -c /php/deploy/nginx7.conf -g "daemon off;"

‎frameworks/PHP/php/php-pools.dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ ARG DEBIAN_FRONTEND=noninteractive
55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql > /dev/null
8+
apt-get install -yqq nginx git unzip php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql > /dev/null
99

10-
COPY deploy/conf/* /etc/php/8.0/fpm/
10+
COPY deploy/conf/* /etc/php/8.1/fpm/
1111

1212
ADD ./ /php
1313
WORKDIR /php
1414

15-
COPY deploy/conf/php-fpm-pools.conf /etc/php/8.0/fpm/php-fpm.conf
16-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 512|pm.max_children = 256|g" /etc/php/8.0/fpm/php-fpm.conf ; fi;
15+
COPY deploy/conf/php-fpm-pools.conf /etc/php/8.1/fpm/php-fpm.conf
16+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 512|pm.max_children = 256|g" /etc/php/8.1/fpm/php-fpm.conf ; fi;
1717

1818
RUN chmod -R 777 /php
1919

2020
EXPOSE 8080
2121

22-
CMD service php8.0-fpm start && \
22+
CMD service php8.1-fpm start && \
2323
nginx -c /php/deploy/nginx-pools.conf -g "daemon off;"

‎frameworks/PHP/php/php-raw7-tcp.dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ ARG DEBIAN_FRONTEND=noninteractive
55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql > /dev/null
8+
apt-get install -yqq nginx git unzip php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql > /dev/null
99

10-
COPY deploy/conf/* /etc/php/8.0/fpm/
10+
COPY deploy/conf/* /etc/php/8.1/fpm/
1111

1212
ADD ./ /php
1313
WORKDIR /php
1414

15-
RUN sed -i "s|listen = /run/php/php-fpm.sock|listen = 127.0.0.1:9001|g" /etc/php/8.0/fpm/php-fpm.conf
15+
RUN sed -i "s|listen = /run/php/php-fpm.sock|listen = 127.0.0.1:9001|g" /etc/php/8.1/fpm/php-fpm.conf
1616
RUN sed -i "s|server unix:/var/run/php/php-fpm.sock;|server 127.0.0.1:9001;|g" deploy/nginx7.conf
1717

18-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.0/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.1/fpm/php-fpm.conf ; fi;
1919

2020
RUN chmod -R 777 /php
2121

2222
EXPOSE 8080
2323

24-
CMD service php8.0-fpm start && \
24+
CMD service php8.1-fpm start && \
2525
nginx -c /php/deploy/nginx7.conf -g "daemon off;"

‎frameworks/PHP/php/php.dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ ARG DEBIAN_FRONTEND=noninteractive
55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql > /dev/null
8+
apt-get install -yqq nginx git unzip php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql > /dev/null
99

10-
COPY deploy/conf/* /etc/php/8.0/fpm/
10+
COPY deploy/conf/* /etc/php/8.1/fpm/
1111

1212
ADD ./ /php
1313
WORKDIR /php
1414

15-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.0/fpm/php-fpm.conf ; fi;
15+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.1/fpm/php-fpm.conf ; fi;
1616

1717
RUN chmod -R 777 /php
1818

1919
EXPOSE 8080
2020

21-
CMD service php8.0-fpm start && \
21+
CMD service php8.1-fpm start && \
2222
nginx -c /php/deploy/nginx7.conf -g "daemon off;"

0 commit comments

Comments
 (0)