Browse Source

[php] Update to 8.1 (#6896)

Joan Miquel 3 years ago
parent
commit
9c9fb2d9f9

+ 5 - 5
frameworks/PHP/php/benchmark_config.json

@@ -14,7 +14,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "None",
       "framework": "None",
       "language": "PHP",
       "language": "PHP",
-      "flavor": "PHP7",
+      "flavor": "PHP8.1",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "FPM/FastCGI",
       "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "webserver": "nginx",
@@ -37,7 +37,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "None",
       "framework": "None",
       "language": "PHP",
       "language": "PHP",
-      "flavor": "PHP7",
+      "flavor": "PHP8.1",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "FPM/FastCGI",
       "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "webserver": "nginx",
@@ -58,7 +58,7 @@
       "database": "Postgres",
       "database": "Postgres",
       "framework": "None",
       "framework": "None",
       "language": "PHP",
       "language": "PHP",
-      "flavor": "PHP7",
+      "flavor": "PHP8.1",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "FPM/FastCGI",
       "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "webserver": "nginx",
@@ -81,7 +81,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "None",
       "framework": "None",
       "language": "PHP",
       "language": "PHP",
-      "flavor": "PHP7",
+      "flavor": "PHP8.1",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "FPM/FastCGI",
       "platform": "FPM/FastCGI",
       "webserver": "h2o",
       "webserver": "h2o",
@@ -127,7 +127,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "None",
       "framework": "None",
       "language": "PHP",
       "language": "PHP",
-      "flavor": "PHP7",
+      "flavor": "PHP8.1",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "FPM/FastCGI",
       "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "webserver": "nginx",

+ 4 - 4
frameworks/PHP/php/php-h2o.dockerfile

@@ -12,11 +12,11 @@ RUN apt-get update > /dev/null && \
 ### Install php
 ### Install php
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null
 RUN apt-get update -yqq > /dev/null && \
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql  > /dev/null
+    apt-get install -yqq php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql  > /dev/null
 
 
-COPY deploy/conf/* /etc/php/8.0/fpm/
+COPY deploy/conf/* /etc/php/8.1/fpm/
 
 
-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;
+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;
 
 
 ### Install h2o
 ### Install h2o
 
 
@@ -35,5 +35,5 @@ EXPOSE 8080
 
 
 CMD export WORKERS=$(( 2 * $(nproc) )) && \
 CMD export WORKERS=$(( 2 * $(nproc) )) && \
     sed -i "s/num-threads: x/num-threads: $WORKERS/g" /deploy/h2o.conf && \
     sed -i "s/num-threads: x/num-threads: $WORKERS/g" /deploy/h2o.conf && \
-    service php8.0-fpm start && \
+    service php8.1-fpm start && \
     /h2o/bin/h2o -c /deploy/h2o.conf
     /h2o/bin/h2o -c /deploy/h2o.conf

+ 4 - 4
frameworks/PHP/php/php-pgsql-raw.dockerfile

@@ -5,9 +5,9 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-pgsql  > /dev/null
+    apt-get install -yqq nginx git unzip php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-pgsql  > /dev/null
 
 
-COPY deploy/conf/* /etc/php/8.0/fpm/
+COPY deploy/conf/* /etc/php/8.1/fpm/
 
 
 ADD ./ /php
 ADD ./ /php
 WORKDIR /php
 WORKDIR /php
@@ -17,11 +17,11 @@ RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" dbquery.php
 RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" fortune.php
 RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" fortune.php
 RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" updateraw.php
 RUN sed -i "s|PDO('mysql:|PDO('pgsql:|g" updateraw.php
 
 
-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;
+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;
 
 
 RUN chmod -R 777 /php
 RUN chmod -R 777 /php
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD service php8.0-fpm start && \
+CMD service php8.1-fpm start && \
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"

+ 5 - 5
frameworks/PHP/php/php-pools.dockerfile

@@ -5,19 +5,19 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql  > /dev/null
+    apt-get install -yqq nginx git unzip php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql  > /dev/null
 
 
-COPY deploy/conf/* /etc/php/8.0/fpm/
+COPY deploy/conf/* /etc/php/8.1/fpm/
 
 
 ADD ./ /php
 ADD ./ /php
 WORKDIR /php
 WORKDIR /php
 
 
-COPY deploy/conf/php-fpm-pools.conf /etc/php/8.0/fpm/php-fpm.conf
-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;
+COPY deploy/conf/php-fpm-pools.conf /etc/php/8.1/fpm/php-fpm.conf
+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;
 
 
 RUN chmod -R 777 /php
 RUN chmod -R 777 /php
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD service php8.0-fpm start && \
+CMD service php8.1-fpm start && \
     nginx -c /php/deploy/nginx-pools.conf -g "daemon off;"
     nginx -c /php/deploy/nginx-pools.conf -g "daemon off;"

+ 5 - 5
frameworks/PHP/php/php-raw7-tcp.dockerfile

@@ -5,21 +5,21 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql  > /dev/null
+    apt-get install -yqq nginx git unzip php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql  > /dev/null
 
 
-COPY deploy/conf/* /etc/php/8.0/fpm/
+COPY deploy/conf/* /etc/php/8.1/fpm/
 
 
 ADD ./ /php
 ADD ./ /php
 WORKDIR /php
 WORKDIR /php
 
 
-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
+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
 RUN sed -i "s|server unix:/var/run/php/php-fpm.sock;|server 127.0.0.1:9001;|g" deploy/nginx7.conf
 RUN sed -i "s|server unix:/var/run/php/php-fpm.sock;|server 127.0.0.1:9001;|g" deploy/nginx7.conf
 
 
-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;
+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;
 
 
 RUN chmod -R 777 /php
 RUN chmod -R 777 /php
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD service php8.0-fpm start && \
+CMD service php8.1-fpm start && \
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"

+ 4 - 4
frameworks/PHP/php/php.dockerfile

@@ -5,18 +5,18 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql  > /dev/null
+    apt-get install -yqq nginx git unzip php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql  > /dev/null
 
 
-COPY deploy/conf/* /etc/php/8.0/fpm/
+COPY deploy/conf/* /etc/php/8.1/fpm/
 
 
 ADD ./ /php
 ADD ./ /php
 WORKDIR /php
 WORKDIR /php
 
 
-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;
+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;
 
 
 RUN chmod -R 777 /php
 RUN chmod -R 777 /php
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD service php8.0-fpm start && \
+CMD service php8.1-fpm start && \
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"