Browse Source

[php-orm] Update to php 8.1 (#6911)

* [php-orm] Update to php 8.1

* Small change to rerun CI
Joan Miquel 3 years ago
parent
commit
e28220e407

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

@@ -148,7 +148,7 @@
       "database": "MySQL",
       "framework": "None",
       "language": "PHP",
-      "flavor": "PHP7",
+      "flavor": "PHP8.1",
       "orm": "Full",
       "platform": "FPM/FastCGI",
       "webserver": "nginx",
@@ -167,7 +167,7 @@
       "database": "MySQL",
       "framework": "None",
       "language": "PHP",
-      "flavor": "PHP7",
+      "flavor": "PHP8.1",
       "orm": "Micro",
       "platform": "FPM/FastCGI",
       "webserver": "nginx",

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

@@ -5,16 +5,16 @@ 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  php8.0-mbstring > /dev/null
+    apt-get install -yqq nginx git unzip php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql php8.1-mbstring php8.1-dev > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-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;
 
 COPY deploy/eloquent/composer* ./
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
@@ -23,5 +23,6 @@ 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;"
+

+ 4 - 4
frameworks/PHP/php/php-laravel-query-builder.dockerfile

@@ -5,16 +5,16 @@ 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  php8.0-mbstring > /dev/null
+    apt-get install -yqq nginx git unzip php8.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql php8.1-mbstring php8.1-dev > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-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;
 
 COPY deploy/eloquent/composer* ./
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
@@ -23,5 +23,5 @@ 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;"