From 6d038087141359f2d7d45da7a13220e7718b276a Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 10:25:20 +0800
Subject: [PATCH] fixed

---
 php-fpm/Dockerfile    | 5 ++---
 php-worker/Dockerfile | 5 ++---
 workspace/Dockerfile  | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 94236b68..34f2f6aa 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -854,9 +854,8 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       apt-get update -yqq \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
-      pecl install phalcon-5.0.0; \
-      mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
-      && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
+      echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
       && docker-php-ext-enable phalcon \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 908fcc57..359f24c8 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -317,9 +317,8 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       apt-get update -yqq \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
-      pecl install phalcon-5.0.0; \
-      mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
-      && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
+      echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
       && docker-php-ext-enable phalcon \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index cccd8268..d1c18cf4 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1325,9 +1325,8 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       apt-get update -yqq \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
-      pecl install phalcon-5.0.0; \
-      mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
-      && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
+      pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
+      echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
       && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
       && docker-php-ext-enable phalcon \