Browse Source

[php] Plain PHP with Adapterman add JIT (#10013)

* [php] Plain PHP with Adapterman add JIT

* Small change to rerun CI

* Again small change that fail the CI build

* Again small change for CI

* Rerun CI

* Fix dockerfile
Joan Miquel 1 month ago
parent
commit
f69cde7a46
2 changed files with 11 additions and 11 deletions
  1. 9 9
      frameworks/PHP/php/php-h2o.dockerfile
  2. 2 2
      frameworks/PHP/php/php-workerman.dockerfile

+ 9 - 9
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" \

+ 2 - 2
frameworks/PHP/php/php-workerman.dockerfile

@@ -12,9 +12,9 @@ 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
+COPY --from=composer/composer:latest-bin --link /composer /usr/local/bin/composer
 
 WORKDIR /php
 COPY --link . .