Browse Source

[ubiquity] Update to php 8.1 (#6905)

Joan Miquel 3 years ago
parent
commit
cd5d04cb92

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

@@ -15,7 +15,7 @@
         "database": "MySQL",
         "database": "MySQL",
         "framework": "ubiquity",
         "framework": "ubiquity",
         "language": "PHP",
         "language": "PHP",
-        "flavor": "PHP8",
+        "flavor": "PHP8.1",
         "orm": "Full",
         "orm": "Full",
         "platform": "FPM/FastCGI",
         "platform": "FPM/FastCGI",
         "webserver": "nginx",
         "webserver": "nginx",
@@ -37,7 +37,7 @@
         "database": "Postgres",
         "database": "Postgres",
         "framework": "Ubiquity",
         "framework": "Ubiquity",
         "language": "PHP",
         "language": "PHP",
-        "flavor": "PHP8",
+        "flavor": "PHP8.1",
         "orm": "Full",
         "orm": "Full",
         "platform": "workerman",
         "platform": "workerman",
         "webserver": "none",
         "webserver": "none",
@@ -146,7 +146,7 @@
         "database": "Mysql",
         "database": "Mysql",
         "framework": "Ubiquity",
         "framework": "Ubiquity",
         "language": "PHP",
         "language": "PHP",
-        "flavor": "PHP8",
+        "flavor": "PHP8.1",
         "orm": "Full",
         "orm": "Full",
         "platform": "workerman",
         "platform": "workerman",
         "webserver": "none",
         "webserver": "none",
@@ -167,7 +167,7 @@
         "database": "MongoDB",
         "database": "MongoDB",
         "framework": "Ubiquity",
         "framework": "Ubiquity",
         "language": "PHP",
         "language": "PHP",
-        "flavor": "PHP8",
+        "flavor": "PHP8.1",
         "orm": "Full",
         "orm": "Full",
         "platform": "workerman",
         "platform": "workerman",
         "webserver": "none",
         "webserver": "none",
@@ -190,7 +190,7 @@
         "database": "Postgres",
         "database": "Postgres",
         "framework": "Ubiquity",
         "framework": "Ubiquity",
         "language": "PHP",
         "language": "PHP",
-        "flavor": "PHP8",
+        "flavor": "PHP8.1",
         "orm": "raw",
         "orm": "raw",
         "platform": "workerman",
         "platform": "workerman",
         "webserver": "none",
         "webserver": "none",

+ 6 - 6
frameworks/PHP/ubiquity/ubiquity-workerman-mongo.dockerfile

@@ -5,14 +5,14 @@ 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 git php8.0-cli php8.0-mongodb php8.0-xml php8.0-mbstring > /dev/null
+    apt-get install -yqq git php8.1-cli php8.1-mongodb php8.1-xml php8.1-mbstring > /dev/null
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
-RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
-RUN pecl install event-3.0.5 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini
+RUN apt-get install -y php-pear php8.1-dev libevent-dev > /dev/null
+RUN pecl install event-3.0.6 > /dev/null && echo "extension=event.so" > /etc/php/8.1/cli/conf.d/event.ini
 
 
-COPY deploy/conf/php-async.ini /etc/php/8.0/cli/php.ini
+COPY deploy/conf/php-async.ini /etc/php/8.1/cli/php.ini
 
 
 ADD ./ /ubiquity
 ADD ./ /ubiquity
 
 
@@ -31,8 +31,8 @@ RUN chmod 777 -R /ubiquity/.ubiquity/*
 
 
 COPY deploy/conf/workerman/mongo/workerServices.php app/config/workerServices.php
 COPY deploy/conf/workerman/mongo/workerServices.php app/config/workerServices.php
 
 
-RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.0/cli/php.ini
-RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.0/cli/php.ini
+RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.1/cli/php.ini
+RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.1/cli/php.ini
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 

+ 6 - 6
frameworks/PHP/ubiquity/ubiquity-workerman-mysql.dockerfile

@@ -5,14 +5,14 @@ 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 git php8.0-cli php8.0-mysql php8.0-xml php8.0-mbstring > /dev/null
+    apt-get install -yqq git php8.1-cli php8.1-mysql php8.1-xml php8.1-mbstring > /dev/null
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
-RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
-RUN pecl install event-3.0.5 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini
+RUN apt-get install -y php-pear php8.1-dev libevent-dev > /dev/null
+RUN pecl install event-3.0.6 > /dev/null && echo "extension=event.so" > /etc/php/8.1/cli/conf.d/event.ini
 
 
-COPY deploy/conf/php-async.ini /etc/php/8.0/cli/php.ini
+COPY deploy/conf/php-async.ini /etc/php/8.1/cli/php.ini
 
 
 ADD ./ /ubiquity
 ADD ./ /ubiquity
 WORKDIR /ubiquity
 WORKDIR /ubiquity
@@ -30,8 +30,8 @@ RUN chmod 777 -R /ubiquity/.ubiquity/*
 
 
 COPY deploy/conf/workerman/mysql/workerServices.php app/config/workerServices.php
 COPY deploy/conf/workerman/mysql/workerServices.php app/config/workerServices.php
 
 
-RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.0/cli/php.ini
-RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.0/cli/php.ini
+RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.1/cli/php.ini
+RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.1/cli/php.ini
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 

+ 6 - 6
frameworks/PHP/ubiquity/ubiquity-workerman-raw.dockerfile

@@ -5,14 +5,14 @@ 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 git php8.0-cli php8.0-pgsql php8.0-xml php8.0-mbstring > /dev/null
+    apt-get install -yqq git php8.1-cli php8.1-pgsql php8.1-xml php8.1-mbstring > /dev/null
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
-RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
-RUN pecl install event-3.0.5 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini
+RUN apt-get install -y php-pear php8.1-dev libevent-dev > /dev/null
+RUN pecl install event-3.0.6 > /dev/null && echo "extension=event.so" > /etc/php/8.1/cli/conf.d/event.ini
 
 
-COPY deploy/conf/php-async.ini /etc/php/8.0/cli/php.ini
+COPY deploy/conf/php-async.ini /etc/php/8.1/cli/php.ini
 
 
 ADD ./ /ubiquity
 ADD ./ /ubiquity
 WORKDIR /ubiquity
 WORKDIR /ubiquity
@@ -30,8 +30,8 @@ RUN chmod 777 -R /ubiquity/.ubiquity/*
 
 
 COPY deploy/conf/workerman/pgsql/raw/workerServices.php app/config/workerServices.php
 COPY deploy/conf/workerman/pgsql/raw/workerServices.php app/config/workerServices.php
 
 
-RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.0/cli/php.ini
-RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.0/cli/php.ini
+RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.1/cli/php.ini
+RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.1/cli/php.ini
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 

+ 6 - 6
frameworks/PHP/ubiquity/ubiquity-workerman.dockerfile

@@ -5,14 +5,14 @@ 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 git php8.0-cli php8.0-pgsql php8.0-xml php8.0-mbstring > /dev/null
+    apt-get install -yqq git php8.1-cli php8.1-pgsql php8.1-xml php8.1-mbstring > /dev/null
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
-RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
-RUN pecl install event-3.0.5 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini
+RUN apt-get install -y php-pear php8.1-dev libevent-dev > /dev/null
+RUN pecl install event-3.0.6 > /dev/null && echo "extension=event.so" > /etc/php/8.1/cli/conf.d/event.ini
 
 
-COPY deploy/conf/php-async.ini /etc/php/8.0/cli/php.ini
+COPY deploy/conf/php-async.ini /etc/php/8.1/cli/php.ini
 
 
 ADD ./ /ubiquity
 ADD ./ /ubiquity
 WORKDIR /ubiquity
 WORKDIR /ubiquity
@@ -30,8 +30,8 @@ RUN chmod 777 -R /ubiquity/.ubiquity/*
 
 
 COPY deploy/conf/workerman/pgsql/workerServices.php app/config/workerServices.php
 COPY deploy/conf/workerman/pgsql/workerServices.php app/config/workerServices.php
 
 
-RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.0/cli/php.ini
-RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=function\n" >> /etc/php/8.0/cli/php.ini
+RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.1/cli/php.ini
+RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=function\n" >> /etc/php/8.1/cli/php.ini
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 

+ 5 - 5
frameworks/PHP/ubiquity/ubiquity.dockerfile

@@ -5,16 +5,16 @@ 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 php8.1-dev > /dev/null
 
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 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 ./ /ubiquity
 ADD ./ /ubiquity
 WORKDIR /ubiquity
 WORKDIR /ubiquity
 
 
-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 composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 
 
@@ -22,9 +22,9 @@ RUN chmod 777 -R /ubiquity/app/cache/*
 
 
 COPY deploy/conf/ubiquity-config.php app/config/config.php
 COPY deploy/conf/ubiquity-config.php app/config/config.php
 
 
-RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.0/fpm/php.ini
+RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.1/fpm/php.ini
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD service php8.0-fpm start && \
+CMD service php8.1-fpm start && \
     nginx -c /ubiquity/deploy/nginx.conf -g "daemon off;"
     nginx -c /ubiquity/deploy/nginx.conf -g "daemon off;"