Browse Source

[php] Fix Leaf v3.6 dockerfiles (#9250)

* Leafphp fix dockerfiles

* Clean event install
Joan Miquel 11 months ago
parent
commit
8afa827e93
2 changed files with 12 additions and 11 deletions
  1. 8 7
      frameworks/PHP/leaf/leaf-workerman.dockerfile
  2. 4 4
      frameworks/PHP/leaf/leaf.dockerfile

+ 8 - 7
frameworks/PHP/leaf/leaf-workerman.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,21 +7,22 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 RUN apt-get update -yqq > /dev/null && apt-get install -yqq git \
-    php8.3-cli php8.3-mysql php8.3-mbstring php8.3-xml php8.3-curl > /dev/null
+    php8.3-cli php8.3-mysql php8.3-mbstring php8.3-xml php8.3-curl php8.3-zip > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-RUN apt-get install -y php-pear php8.3-dev libevent-dev > /dev/null
-RUN pecl install event-3.1.3 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
+RUN apt-get install -y libevent-dev php8.3-dev > /dev/null \
+    && pecl install event-3.1.4 > /dev/null \
+    && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
 
-COPY deploy/conf/cli-php.ini /etc/php/8.3/cli/php.ini
+COPY --link deploy/conf/cli-php.ini /etc/php/8.3/cli/php.ini
 
-ADD ./ /leaf
 WORKDIR /leaf
+COPY --link . .
 
 EXPOSE 8080
 
-RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet 
+RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 RUN composer require joanhey/adapterman:^0.6 --quiet
 
 

+ 4 - 4
frameworks/PHP/leaf/leaf.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,14 +7,14 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 RUN apt-get install -yqq nginx git unzip \
-    php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql php8.3-xml php8.3-curl > /dev/null
+    php8.3-cli php8.3-fpm php8.3-mysql php8.3-xml php8.3-curl php8.3-zip > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-COPY deploy/conf/* /etc/php/8.3/fpm/
+COPY --link deploy/conf/* /etc/php/8.3/fpm/
 
-ADD ./ /leaf
 WORKDIR /leaf
+COPY --link . .
 
 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;