Skip to content

[php] Plain PHP update to 8.1 #6896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 12, 2021
Merged

[php] Plain PHP update to 8.1 #6896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions frameworks/PHP/php/benchmark_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"database": "MySQL",
"framework": "None",
"language": "PHP",
"flavor": "PHP7",
"flavor": "PHP8.1",
"orm": "Raw",
"platform": "FPM/FastCGI",
"webserver": "nginx",
Expand All @@ -37,7 +37,7 @@
"database": "MySQL",
"framework": "None",
"language": "PHP",
"flavor": "PHP7",
"flavor": "PHP8.1",
"orm": "Raw",
"platform": "FPM/FastCGI",
"webserver": "nginx",
Expand All @@ -58,7 +58,7 @@
"database": "Postgres",
"framework": "None",
"language": "PHP",
"flavor": "PHP7",
"flavor": "PHP8.1",
"orm": "Raw",
"platform": "FPM/FastCGI",
"webserver": "nginx",
Expand All @@ -81,7 +81,7 @@
"database": "MySQL",
"framework": "None",
"language": "PHP",
"flavor": "PHP7",
"flavor": "PHP8.1",
"orm": "Raw",
"platform": "FPM/FastCGI",
"webserver": "h2o",
Expand Down Expand Up @@ -127,7 +127,7 @@
"database": "MySQL",
"framework": "None",
"language": "PHP",
"flavor": "PHP7",
"flavor": "PHP8.1",
"orm": "Raw",
"platform": "FPM/FastCGI",
"webserver": "nginx",
Expand Down
8 changes: 4 additions & 4 deletions frameworks/PHP/php/php-h2o.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ RUN apt-get update > /dev/null && \
### Install php
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /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

Expand All @@ -35,5 +35,5 @@ EXPOSE 8080

CMD export WORKERS=$(( 2 * $(nproc) )) && \
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
8 changes: 4 additions & 4 deletions frameworks/PHP/php/php-pgsql-raw.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ ARG DEBIAN_FRONTEND=noninteractive
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 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
WORKDIR /php
Expand All @@ -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" 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

EXPOSE 8080

CMD service php8.0-fpm start && \
CMD service php8.1-fpm start && \
nginx -c /php/deploy/nginx7.conf -g "daemon off;"
10 changes: 5 additions & 5 deletions frameworks/PHP/php/php-pools.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ ARG DEBIAN_FRONTEND=noninteractive
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 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
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

EXPOSE 8080

CMD service php8.0-fpm start && \
CMD service php8.1-fpm start && \
nginx -c /php/deploy/nginx-pools.conf -g "daemon off;"
10 changes: 5 additions & 5 deletions frameworks/PHP/php/php-raw7-tcp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ ARG DEBIAN_FRONTEND=noninteractive
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 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
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 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

EXPOSE 8080

CMD service php8.0-fpm start && \
CMD service php8.1-fpm start && \
nginx -c /php/deploy/nginx7.conf -g "daemon off;"
8 changes: 4 additions & 4 deletions frameworks/PHP/php/php.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ ARG DEBIAN_FRONTEND=noninteractive
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 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
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

EXPOSE 8080

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