Browse Source

[php] Mixphp update to PHP 8.3 (#8593)

Joan Miquel 1 year ago
parent
commit
1adf7805ba

+ 2 - 2
frameworks/PHP/mixphp/mixphp-swoole-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0-cli
+FROM php:8.3-cli
 
 
 RUN pecl install swoole > /dev/null && docker-php-ext-enable swoole
 RUN pecl install swoole > /dev/null && docker-php-ext-enable swoole
 
 
@@ -18,7 +18,7 @@ RUN php -v && php -i | grep opcache
 
 
 WORKDIR /mixphp
 WORKDIR /mixphp
 
 
-RUN curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null
 RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null
 RUN composer dumpautoload -o
 RUN composer dumpautoload -o
 
 

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

@@ -1,21 +1,21 @@
-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 && apt-get install -yqq git unzip wget curl build-essential php8.1-cli php8.1-mbstring php8.1-curl php8.1-xml php8.1-mysql > /dev/null
+RUN apt-get update -yqq && apt-get install -yqq git unzip wget curl build-essential php8.3-cli php8.3-mbstring php8.3-curl php8.3-xml php8.3-mysql > /dev/null
 
 
-RUN apt-get install -y php8.1-dev libevent-dev > /dev/null
+RUN apt-get install -y php8.3-dev libevent-dev > /dev/null
 RUN wget http://pear.php.net/go-pear.phar --quiet && php go-pear.phar
 RUN wget http://pear.php.net/go-pear.phar --quiet && php go-pear.phar
-RUN pecl install event-3.0.8 > /dev/null && echo "extension=event.so" > /etc/php/8.1/cli/conf.d/event.ini
+RUN pecl install event-3.0.8 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
 
 
-COPY php-jit.ini /etc/php/8.1/cli/php.ini
+COPY php-jit.ini /etc/php/8.3/cli/php.ini
 
 
 ADD ./ /mixphp
 ADD ./ /mixphp
 WORKDIR /mixphp
 WORKDIR /mixphp
 
 
-RUN curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null
 RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null
 RUN composer dumpautoload -o
 RUN composer dumpautoload -o
 
 

+ 5 - 5
frameworks/PHP/mixphp/mixphp-workerman-pgsql.dockerfile

@@ -4,20 +4,20 @@ 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 && apt-get install -yqq git unzip wget curl build-essential php8.2-cli php8.2-mbstring php8.2-curl php8.2-xml php8.2-pgsql > /dev/null
+RUN apt-get update -yqq && apt-get install -yqq git unzip wget curl build-essential php8.3-cli php8.3-mbstring php8.3-curl php8.3-xml php8.3-pgsql > /dev/null
 
 
-RUN apt-get install -y php8.2-dev libevent-dev > /dev/null
+RUN apt-get install -y php8.3-dev libevent-dev > /dev/null
 RUN wget http://pear.php.net/go-pear.phar --quiet && php go-pear.phar
 RUN wget http://pear.php.net/go-pear.phar --quiet && php go-pear.phar
-RUN pecl install event-3.0.8 > /dev/null && echo "extension=event.so" > /etc/php/8.2/cli/conf.d/event.ini
+RUN pecl install event-3.0.8 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
 
 
-COPY php-jit.ini /etc/php/8.2/cli/php.ini
+COPY php-jit.ini /etc/php/8.3/cli/php.ini
 
 
 ADD ./ /mixphp
 ADD ./ /mixphp
 WORKDIR /mixphp
 WORKDIR /mixphp
 
 
 RUN sed -i "s|Benchmark();|BenchmarkRaw();|g" /mixphp/routes/index.php
 RUN sed -i "s|Benchmark();|BenchmarkRaw();|g" /mixphp/routes/index.php
 
 
-RUN curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null
 RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null
 RUN composer dumpautoload -o
 RUN composer dumpautoload -o
 
 

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

@@ -4,16 +4,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 && apt-get install -yqq git unzip wget curl build-essential nginx php8.2-fpm php8.2-mysql php8.2-dev > /dev/null
+RUN apt-get update -yqq && apt-get install -yqq git unzip wget curl build-essential nginx php8.3-fpm php8.3-mysql php8.3-dev > /dev/null
 
 
-COPY deploy/conf/* /etc/php/8.2/fpm/
+COPY deploy/conf/* /etc/php/8.3/fpm/
 
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.2/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;
 
 
 ADD ./ /mixphp
 ADD ./ /mixphp
 WORKDIR /mixphp
 WORKDIR /mixphp
 
 
-RUN curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null
 RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null
 RUN composer dumpautoload -o
 RUN composer dumpautoload -o
 
 
@@ -22,5 +22,5 @@ RUN chmod -R 777 /mixphp/runtime/logs
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD service php8.2-fpm start && \
+CMD service php8.3-fpm start && \
     nginx -c /mixphp/deploy/nginx.conf
     nginx -c /mixphp/deploy/nginx.conf