Skip to content

Commit 8afa827

Browse files
authored
[php] Fix Leaf v3.6 dockerfiles (#9250)
* Leafphp fix dockerfiles * Clean event install
1 parent f834743 commit 8afa827

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

frameworks/PHP/leaf/leaf-workerman.dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

@@ -7,21 +7,22 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
77
apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
88

99
RUN apt-get update -yqq > /dev/null && apt-get install -yqq git \
10-
php8.3-cli php8.3-mysql php8.3-mbstring php8.3-xml php8.3-curl > /dev/null
10+
php8.3-cli php8.3-mysql php8.3-mbstring php8.3-xml php8.3-curl php8.3-zip > /dev/null
1111

1212
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1313

14-
RUN apt-get install -y php-pear php8.3-dev libevent-dev > /dev/null
15-
RUN pecl install event-3.1.3 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
14+
RUN apt-get install -y libevent-dev php8.3-dev > /dev/null \
15+
&& pecl install event-3.1.4 > /dev/null \
16+
&& echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
1617

17-
COPY deploy/conf/cli-php.ini /etc/php/8.3/cli/php.ini
18+
COPY --link deploy/conf/cli-php.ini /etc/php/8.3/cli/php.ini
1819

19-
ADD ./ /leaf
2020
WORKDIR /leaf
21+
COPY --link . .
2122

2223
EXPOSE 8080
2324

24-
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
25+
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
2526
RUN composer require joanhey/adapterman:^0.6 --quiet
2627

2728

frameworks/PHP/leaf/leaf.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

@@ -7,14 +7,14 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
77
apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
88

99
RUN apt-get install -yqq nginx git unzip \
10-
php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql php8.3-xml php8.3-curl > /dev/null
10+
php8.3-cli php8.3-fpm php8.3-mysql php8.3-xml php8.3-curl php8.3-zip > /dev/null
1111

1212
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1313

14-
COPY deploy/conf/* /etc/php/8.3/fpm/
14+
COPY --link deploy/conf/* /etc/php/8.3/fpm/
1515

16-
ADD ./ /leaf
1716
WORKDIR /leaf
17+
COPY --link . .
1818

1919
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;
2020

0 commit comments

Comments
 (0)