From df4ef54889a6b8539381daea8444283a89d4a321 Mon Sep 17 00:00:00 2001 From: zhushaolong <15210900722@163.com> Date: Thu, 25 Apr 2024 18:12:23 +0800 Subject: [PATCH 1/2] Update php-worker Dockerfile --- php-worker/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 7a448ba0d9..9afe9c0172 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -348,11 +348,11 @@ ARG INSTALL_PHALCON=false ARG LARADOCK_PHALCON_VERSION ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION} -RUN if [ $INSTALL_PHALCON = true ]; then \ - apt-get update -yqq \ +RUN if [ "$INSTALL_PHALCON" = true ]; then \ + apk update \ && pecl channel-update pecl.php.net \ - && apt-get install -yqq libpcre3-dev; \ - pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \ + && apk add --no-cache libpcre32 \ + && pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \ docker-php-ext-enable phalcon; \ php -m | grep -q 'phalcon' \ ;fi From 2d08b4fcf06195ab5be46794a5264f61c5299ce9 Mon Sep 17 00:00:00 2001 From: zhushaolong <15210900722@163.com> Date: Thu, 25 Apr 2024 18:13:25 +0800 Subject: [PATCH 2/2] Update docker-compose.yml --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 4d7a8c359a..83a23de1fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -333,6 +333,7 @@ services: - CHANGE_SOURCE=${CHANGE_SOURCE} - LARADOCK_PHP_VERSION=${PHP_VERSION} - PHALCON_VERSION=${PHALCON_VERSION} + - LARADOCK_PHALCON_VERSION=${PHALCON_VERSION} - INSTALL_BZ2=${PHP_WORKER_INSTALL_BZ2} - INSTALL_GD=${PHP_WORKER_INSTALL_GD} - INSTALL_IMAGEMAGICK=${PHP_WORKER_INSTALL_IMAGEMAGICK}