From 725a2ce35c7a3197b89ebd24492d4be9866efd70 Mon Sep 17 00:00:00 2001 From: Joanhey Date: Tue, 14 Jan 2025 20:31:32 +0100 Subject: [PATCH 1/2] [php] Amp update to PHP/8.4 --- frameworks/PHP/amp/amp.dockerfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/frameworks/PHP/amp/amp.dockerfile b/frameworks/PHP/amp/amp.dockerfile index 066337e6302..9ec0336801d 100644 --- a/frameworks/PHP/amp/amp.dockerfile +++ b/frameworks/PHP/amp/amp.dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 ARG DEBIAN_FRONTEND=noninteractive @@ -6,20 +6,19 @@ RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /de RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php RUN apt-get update -yqq > /dev/null && \ apt-get install -yqq git unzip wget curl build-essential \ - php8.3-cli php8.3-mbstring php8.3-dev php8.3-xml php8.3-curl > /dev/null + php8.4-cli php8.4-mbstring php8.4-dev php8.4-xml php8.4-curl > /dev/null # An extension is required! # We deal with concurrencies over 1k, which stream_select doesn't support. RUN wget http://pear.php.net/go-pear.phar --quiet && php go-pear.phar #RUN apt-get install -y libuv1-dev > /dev/null RUN apt-get install -y libevent-dev > /dev/null -#RUN pecl install uv-0.2.4 > /dev/null && echo "extension=uv.so" > /etc/php/8.3/cli/conf.d/uv.ini -RUN pecl install event-3.1.3 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini +#RUN pecl install uv-0.2.4 > /dev/null && echo "extension=uv.so" > /etc/php/8.4/cli/conf.d/uv.ini +RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini -ADD ./ /amp WORKDIR /amp - -COPY deploy/conf/* /etc/php/8.3/cli/conf.d/ +COPY --link . . +COPY deploy/conf/* /etc/php/8.4/cli/conf.d/ COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer From 8ac6fdbfa7040b5356faf66f788acd39ef1e7a51 Mon Sep 17 00:00:00 2001 From: Joanhey Date: Tue, 14 Jan 2025 20:34:19 +0100 Subject: [PATCH 2/2] Quiet composer install --- frameworks/PHP/amp/amp.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/PHP/amp/amp.dockerfile b/frameworks/PHP/amp/amp.dockerfile index 9ec0336801d..240db763cec 100644 --- a/frameworks/PHP/amp/amp.dockerfile +++ b/frameworks/PHP/amp/amp.dockerfile @@ -22,7 +22,7 @@ COPY deploy/conf/* /etc/php/8.4/cli/conf.d/ COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer -RUN composer install --prefer-dist --optimize-autoloader --no-dev +RUN composer install --prefer-dist --optimize-autoloader --no-dev --quiet EXPOSE 8080