Browse Source

[php] Fatfree update to PHP 8.3 (#8623)

Joan Miquel 1 year ago
parent
commit
f90a353a58

+ 3 - 0
frameworks/PHP/fat-free/deploy/conf/php.ini

@@ -1909,6 +1909,9 @@ opcache.huge_code_pages=1
 ; SSL stream context option.
 ; SSL stream context option.
 ;openssl.capath=
 ;openssl.capath=
 
 
+opcache.jit_buffer_size = 128M
+opcache.jit = tracing
+
 ; Local Variables:
 ; Local Variables:
 ; tab-width: 4
 ; tab-width: 4
 ; End:
 ; End:

+ 5 - 5
frameworks/PHP/fat-free/fat-free-raw.dockerfile

@@ -1,13 +1,13 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 
 ARG DEBIAN_FRONTEND=noninteractive
 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.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql  > /dev/null
+    apt-get install -yqq nginx git unzip php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql  > /dev/null
 
 
-COPY deploy/conf/* /etc/php/8.1/fpm/
+COPY deploy/conf/* /etc/php/8.3/fpm/
 
 
 ADD ./ /fat-free
 ADD ./ /fat-free
 WORKDIR /fat-free
 WORKDIR /fat-free
@@ -18,11 +18,11 @@ COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 
 
-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 if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
 
 
 RUN chmod -R 777 /fat-free
 RUN chmod -R 777 /fat-free
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD service php8.1-fpm start && \
+CMD service php8.3-fpm start && \
     nginx -c /fat-free/deploy/nginx.conf
     nginx -c /fat-free/deploy/nginx.conf

+ 5 - 6
frameworks/PHP/fat-free/fat-free.dockerfile

@@ -1,13 +1,13 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 
 ARG DEBIAN_FRONTEND=noninteractive
 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.1 php8.1-common php8.1-cli php8.1-fpm php8.1-mysql  > /dev/null
+    apt-get install -yqq nginx git unzip php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql  > /dev/null
 
 
-COPY deploy/conf/* /etc/php/8.1/fpm/
+COPY deploy/conf/* /etc/php/8.3/fpm/
 
 
 ADD ./ /fat-free
 ADD ./ /fat-free
 WORKDIR /fat-free
 WORKDIR /fat-free
@@ -18,13 +18,12 @@ ENV F3DIR="/fat-free/src"
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
-#RUN git clone -b 3.7.2 --single-branch --depth 1 "https://github.com/bcosca/fatfree-core.git" src
 
 
-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 if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
 
 
 RUN chmod -R 777 /fat-free
 RUN chmod -R 777 /fat-free
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD service php8.1-fpm start && \
+CMD service php8.3-fpm start && \
     nginx -c /fat-free/deploy/nginx.conf
     nginx -c /fat-free/deploy/nginx.conf