From e41ef9eb3c0a1c11efb1ef8cbfb12a0d3dba493a Mon Sep 17 00:00:00 2001 From: Joanhey Date: Tue, 29 Jul 2025 10:13:50 +0200 Subject: [PATCH 1/6] [php] Plain PHP with Adapterman add JIT --- frameworks/PHP/php/php-workerman.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/PHP/php/php-workerman.dockerfile b/frameworks/PHP/php/php-workerman.dockerfile index b23e8c3249b..2409a2cf8f0 100644 --- a/frameworks/PHP/php/php-workerman.dockerfile +++ b/frameworks/PHP/php/php-workerman.dockerfile @@ -12,7 +12,7 @@ RUN apt-get install -yqq git unzip \ RUN apt-get install -y php-pear php8.4-dev php8.4-xml libevent-dev > /dev/null RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini -COPY deploy/workerman/cli-php.ini /etc/php/8.4/cli/php.ini +COPY deploy/workerman/cli-php.ini /etc/php/8.4/cli/conf.d/20-adapterman.ini COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer From ef76ccb444c98d68085e284f7f4dd885741cc0c5 Mon Sep 17 00:00:00 2001 From: Joan Miquel Date: Mon, 11 Aug 2025 20:36:28 +0200 Subject: [PATCH 2/6] Small change to rerun CI --- frameworks/PHP/php/php-workerman.dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frameworks/PHP/php/php-workerman.dockerfile b/frameworks/PHP/php/php-workerman.dockerfile index 2409a2cf8f0..5ef9d9c029f 100644 --- a/frameworks/PHP/php/php-workerman.dockerfile +++ b/frameworks/PHP/php/php-workerman.dockerfile @@ -1,3 +1,5 @@ +

${numero.slice(0,-9)} ${numero.slice(-9).replace(/(\d{3})(\d{3})(\d{3})/, '$1 $2 $3')} ${callTimes > 1 ? '' + callTimes + '' : ''}

+ ${lastCall ? lastCall.outerHTML : '' } FROM ubuntu:24.04 ARG DEBIAN_FRONTEND=noninteractive @@ -14,7 +16,7 @@ RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php COPY deploy/workerman/cli-php.ini /etc/php/8.4/cli/conf.d/20-adapterman.ini -COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer +COPY --from=composer/composer:latest-bin --link /composer /usr/local/bin/composer WORKDIR /php COPY --link . . From 43c86f20720623c19fd375e1736a2a5fd7105c2c Mon Sep 17 00:00:00 2001 From: Joan Miquel Date: Mon, 11 Aug 2025 20:56:11 +0200 Subject: [PATCH 3/6] Again small change that fail the CI build --- frameworks/PHP/php/php-workerman.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/PHP/php/php-workerman.dockerfile b/frameworks/PHP/php/php-workerman.dockerfile index 5ef9d9c029f..b5f0d0db2a6 100644 --- a/frameworks/PHP/php/php-workerman.dockerfile +++ b/frameworks/PHP/php/php-workerman.dockerfile @@ -31,3 +31,4 @@ RUN chmod -R 777 /php EXPOSE 8080 CMD php start.php start + From 5a0e44b2bd1e8b12bc17ca878f143b7bc7315219 Mon Sep 17 00:00:00 2001 From: Joan Miquel Date: Tue, 12 Aug 2025 02:02:31 +0200 Subject: [PATCH 4/6] Again small change for CI --- frameworks/PHP/php/php-workerman.dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/frameworks/PHP/php/php-workerman.dockerfile b/frameworks/PHP/php/php-workerman.dockerfile index b5f0d0db2a6..5ef9d9c029f 100644 --- a/frameworks/PHP/php/php-workerman.dockerfile +++ b/frameworks/PHP/php/php-workerman.dockerfile @@ -31,4 +31,3 @@ RUN chmod -R 777 /php EXPOSE 8080 CMD php start.php start - From 85b32a3a786ad9f4a3405bb0527a667704d9e831 Mon Sep 17 00:00:00 2001 From: Joan Miquel Date: Tue, 12 Aug 2025 09:51:59 +0200 Subject: [PATCH 5/6] Rerun CI --- frameworks/PHP/php/php-workerman.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/PHP/php/php-workerman.dockerfile b/frameworks/PHP/php/php-workerman.dockerfile index 5ef9d9c029f..b5f0d0db2a6 100644 --- a/frameworks/PHP/php/php-workerman.dockerfile +++ b/frameworks/PHP/php/php-workerman.dockerfile @@ -31,3 +31,4 @@ RUN chmod -R 777 /php EXPOSE 8080 CMD php start.php start + From 1c4fd66ef084eece5223c7e6d51b7910e4028d1d Mon Sep 17 00:00:00 2001 From: Joan Miquel Date: Tue, 12 Aug 2025 10:22:53 +0200 Subject: [PATCH 6/6] Fix dockerfile --- frameworks/PHP/php/php-h2o.dockerfile | 18 +++++++++--------- frameworks/PHP/php/php-workerman.dockerfile | 3 --- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/frameworks/PHP/php/php-h2o.dockerfile b/frameworks/PHP/php/php-h2o.dockerfile index f61bbdbcea6..a54bd0f8136 100644 --- a/frameworks/PHP/php/php-h2o.dockerfile +++ b/frameworks/PHP/php/php-h2o.dockerfile @@ -27,9 +27,9 @@ RUN apt-get -yqq update && \ pkg-config \ rsync \ ruby \ - systemtap-sdt-dev && \ + systemtap-sdt-dev > /dev/null && \ curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \ - tar --strip-components=1 -xz && \ + tar --strip-components=1 -xz > /dev/null && \ cmake \ -B build \ -DCMAKE_AR=/usr/bin/gcc-ar \ @@ -38,9 +38,9 @@ RUN apt-get -yqq update && \ -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \ -DWITH_MRUBY=on \ -G Ninja \ - -S . && \ - cmake --build build -j && \ - cmake --install build + -S . > /dev/null && \ + cmake --build build -j > /dev/null && \ + cmake --install build > /dev/null FROM "ubuntu:${UBUNTU_VERSION}" @@ -49,13 +49,13 @@ ARG PHP_VERSION=8.4 ENV TZ=America/Los_Angeles ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get -yqq update && \ +RUN apt-get -yqq update > /dev/null && \ apt-get -yqq install \ apt-utils \ - software-properties-common && \ + software-properties-common > /dev/null && \ LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php && \ - apt-get -yqq update && \ - apt-get -yqq install \ + apt-get -yqq update > /dev/null && \ + apt-get -yqq install > /dev/null \ "php${PHP_VERSION}" \ "php${PHP_VERSION}-cli" \ "php${PHP_VERSION}-common" \ diff --git a/frameworks/PHP/php/php-workerman.dockerfile b/frameworks/PHP/php/php-workerman.dockerfile index b5f0d0db2a6..40ce5e187af 100644 --- a/frameworks/PHP/php/php-workerman.dockerfile +++ b/frameworks/PHP/php/php-workerman.dockerfile @@ -1,5 +1,3 @@ -

${numero.slice(0,-9)} ${numero.slice(-9).replace(/(\d{3})(\d{3})(\d{3})/, '$1 $2 $3')} ${callTimes > 1 ? '' + callTimes + '' : ''}

- ${lastCall ? lastCall.outerHTML : '' } FROM ubuntu:24.04 ARG DEBIAN_FRONTEND=noninteractive @@ -31,4 +29,3 @@ RUN chmod -R 777 /php EXPOSE 8080 CMD php start.php start -