diff --git a/frameworks/PHP/mixphp/benchmark_config.json b/frameworks/PHP/mixphp/benchmark_config.json index 0b12c37bc7d..155aaff2b2a 100644 --- a/frameworks/PHP/mixphp/benchmark_config.json +++ b/frameworks/PHP/mixphp/benchmark_config.json @@ -1,5 +1,6 @@ { "framework": "mixphp", + "maintainers": ["onanying"], "tests": [ { "default": { diff --git a/frameworks/PHP/mixphp/composer.json b/frameworks/PHP/mixphp/composer.json index 7f5766c4164..1f81196f165 100644 --- a/frameworks/PHP/mixphp/composer.json +++ b/frameworks/PHP/mixphp/composer.json @@ -17,7 +17,7 @@ ] }, "require": { - "workerman/workerman": "^4.0", + "workerman/workerman": "^5.0", "mix/vega": "~3.0", "mix/database": "~3.0", "monolog/monolog": "^2.3" diff --git a/frameworks/PHP/mixphp/mixphp-swoole-mysql.dockerfile b/frameworks/PHP/mixphp/mixphp-swoole-mysql.dockerfile index ce9292f244a..d3d6e26939a 100644 --- a/frameworks/PHP/mixphp/mixphp-swoole-mysql.dockerfile +++ b/frameworks/PHP/mixphp/mixphp-swoole-mysql.dockerfile @@ -1,6 +1,4 @@ -FROM phpswoole/swoole:6.0.2-php8.4 - -RUN docker-php-ext-install pcntl opcache bcmath > /dev/null +FROM phpswoole/swoole:php8.5 WORKDIR /mixphp COPY --link . . @@ -13,7 +11,7 @@ RUN echo "opcache.jit_buffer_size=256M" >> /usr/local/etc/php/php.ini RUN php -v && php -i | grep opcache -RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null +RUN composer install --no-dev --classmap-authoritative --quiet RUN composer dumpautoload -o RUN mkdir -p /mixphp/runtime/logs diff --git a/frameworks/PHP/mixphp/mixphp-workerman-mysql.dockerfile b/frameworks/PHP/mixphp/mixphp-workerman-mysql.dockerfile index c2a282a9611..7fa0d550bab 100644 --- a/frameworks/PHP/mixphp/mixphp-workerman-mysql.dockerfile +++ b/frameworks/PHP/mixphp/mixphp-workerman-mysql.dockerfile @@ -3,20 +3,19 @@ FROM ubuntu:24.04 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 && apt-get install -yqq git unzip wget curl build-essential php8.4-cli php8.4-mbstring php8.4-curl php8.4-xml php8.4-mysql > /dev/null +RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null +RUN apt-get update -yqq && apt-get install -yqq git curl php8.5-cli php8.5-mbstring php8.5-curl php8.5-xml php8.5-mysql > /dev/null -RUN apt-get install -y php8.4-dev libevent-dev > /dev/null -RUN wget http://pear.php.net/go-pear.phar --quiet && php go-pear.phar -RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini +RUN apt-get install -y php8.5-dev libevent-dev > /dev/null +RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini -COPY php-jit.ini /etc/php/8.4/cli/php.ini +COPY php-jit.ini /etc/php/8.5/cli/php.ini -ADD ./ /mixphp WORKDIR /mixphp +COPY . . -COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer -RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null +COPY --from=composer/composer:2-bin --link /composer /usr/local/bin/composer +RUN composer install --no-dev --classmap-authoritative --quiet RUN composer dumpautoload -o RUN mkdir -p /mixphp/runtime/logs diff --git a/frameworks/PHP/mixphp/mixphp-workerman-pgsql.dockerfile b/frameworks/PHP/mixphp/mixphp-workerman-pgsql.dockerfile index 85143701159..df7143d7bb1 100644 --- a/frameworks/PHP/mixphp/mixphp-workerman-pgsql.dockerfile +++ b/frameworks/PHP/mixphp/mixphp-workerman-pgsql.dockerfile @@ -3,22 +3,21 @@ FROM ubuntu:24.04 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 && apt-get install -yqq git unzip wget curl build-essential php8.4-cli php8.4-mbstring php8.4-curl php8.4-xml php8.4-pgsql > /dev/null +RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null +RUN apt-get update -yqq && apt-get install -yqq git curl php8.5-cli php8.5-mbstring php8.5-curl php8.5-xml php8.5-pgsql > /dev/null -RUN apt-get install -y php8.4-dev libevent-dev > /dev/null -RUN wget http://pear.php.net/go-pear.phar --quiet && php go-pear.phar -RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini +RUN apt-get install -y php8.5-dev libevent-dev > /dev/null +RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini -COPY php-jit.ini /etc/php/8.4/cli/php.ini +COPY php-jit.ini /etc/php/8.5/cli/php.ini -ADD ./ /mixphp WORKDIR /mixphp +COPY . . RUN sed -i "s|Benchmark();|BenchmarkRaw();|g" /mixphp/routes/index.php -COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer -RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null +COPY --from=composer/composer:2-bin --link /composer /usr/local/bin/composer +RUN composer install --no-dev --classmap-authoritative --quiet RUN composer dumpautoload -o RUN mkdir -p /mixphp/runtime/logs diff --git a/frameworks/PHP/mixphp/mixphp.dockerfile b/frameworks/PHP/mixphp/mixphp.dockerfile index 360debab252..94f266f0460 100644 --- a/frameworks/PHP/mixphp/mixphp.dockerfile +++ b/frameworks/PHP/mixphp/mixphp.dockerfile @@ -3,18 +3,18 @@ FROM ubuntu:24.04 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 && apt-get install -yqq git unzip wget curl build-essential nginx php8.4-fpm php8.4-mysql php8.4-dev > /dev/null +RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null +RUN apt-get update -yqq && apt-get install -yqq git curl nginx php8.5-fpm php8.5-mysql > /dev/null -COPY deploy/conf/* /etc/php/8.4/fpm/ +COPY deploy/conf/* /etc/php/8.5/fpm/ -RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/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.5/fpm/php-fpm.conf ; fi; -ADD ./ /mixphp WORKDIR /mixphp +COPY . . -COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer -RUN composer install --no-dev --classmap-authoritative --quiet > /dev/null +COPY --from=composer/composer:2-bin --link /composer /usr/local/bin/composer +RUN composer install --no-dev --classmap-authoritative --quiet RUN composer dumpautoload -o RUN mkdir -p /mixphp/runtime/logs @@ -22,5 +22,5 @@ RUN chmod -R 777 /mixphp/runtime/logs EXPOSE 8080 -CMD service php8.4-fpm start && \ +CMD service php8.5-fpm start && \ nginx -c /mixphp/deploy/nginx.conf