From 84854c8f0d6578dcc75fb151f787c70d90e38301 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 06:01:13 +0800
Subject: [PATCH 01/13] update phalcon support

---
 .env.example          |  4 ++--
 php-fpm/Dockerfile    | 18 +++++-------------
 php-worker/Dockerfile | 28 ++++++++++++----------------
 workspace/Dockerfile  | 19 ++++++-------------
 4 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/.env.example b/.env.example
index fcf07853..6d1721ed 100644
--- a/.env.example
+++ b/.env.example
@@ -43,8 +43,8 @@ PHP_VERSION=7.4
 
 ### Phalcon Version ###########################################
 
-# Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 3.4.0+
-PHALCON_VERSION=4.0.5
+# Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 5.0.0+
+PHALCON_VERSION=5.0.0
 
 ### PHP Interpreter #######################################
 
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 46ecbaf2..280e0682 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -854,20 +854,12 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get install -yqq unzip libpcre3-dev gcc make re2c git automake autoconf\
-    && git clone https://github.com/jbboehr/php-psr.git \
-    && cd php-psr \
-    && phpize \
-    && ./configure \
-    && make \
-    && make test \
-    && make install \
-    && curl -L -o /tmp/cphalcon.zip https://github.com/phalcon/cphalcon/archive/v${LARADOCK_PHALCON_VERSION}.zip \
-    && unzip -d /tmp/ /tmp/cphalcon.zip \
-    && cd /tmp/cphalcon-${LARADOCK_PHALCON_VERSION}/build \
-    && ./install \
+    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
-    && rm -rf /tmp/cphalcon* \
+    && 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 \
 ;fi
 
 ###########################################################################
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 687ba903..b45d413d 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -310,24 +310,20 @@ RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
 
 # Install Phalcon ext
 ARG INSTALL_PHALCON=false
-ARG PHALCON_VERSION
-ENV PHALCON_VERSION ${PHALCON_VERSION}
+ARG LARADOCK_PHALCON_VERSION
+ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
+
+# Copy phalcon configration
+COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-  apk --update add unzip gcc make re2c bash\
-  && git clone https://github.com/jbboehr/php-psr.git \
-  && cd php-psr \
-  && phpize \
-  && ./configure \
-  && make \
-  && make test \
-  && make install \
-  && curl -L -o /tmp/cphalcon.zip https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.zip \
-  && unzip -d /tmp/ /tmp/cphalcon.zip \
-  && cd /tmp/cphalcon-${PHALCON_VERSION}/build \
-  && ./install \
-  && rm -rf /tmp/cphalcon* \
-  ;fi
+    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    && 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 \
+    && 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 \
+;fi
 
 ARG INSTALL_GHOSTSCRIPT=false
 RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 5eee6679..60565b1b 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1321,23 +1321,16 @@ ARG INSTALL_PHALCON=false
 ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
+# Copy phalcon configration
+COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
+
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get update && apt-get install -yqq unzip libpcre3-dev gcc make re2c git automake autoconf\
-    && git clone https://github.com/jbboehr/php-psr.git \
-    && cd php-psr \
-    && phpize \
-    && ./configure \
-    && make \
-    && make test \
-    && make install \
-    && curl -L -o /tmp/cphalcon.zip https://github.com/phalcon/cphalcon/archive/v${LARADOCK_PHALCON_VERSION}.zip \
-    && unzip -d /tmp/ /tmp/cphalcon.zip \
-    && cd /tmp/cphalcon-${LARADOCK_PHALCON_VERSION}/build \
-    && ./install \
+    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    && 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 \
     && 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 \
-    && rm -rf /tmp/cphalcon* \
+    && docker-php-ext-enable phalcon \
 ;fi
 
 ###########################################################################

From f9d7fc3b120e289b3dc2d2f69f896c685211a085 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:09:29 +0800
Subject: [PATCH 02/13] fixed

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

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 280e0682..c71118f9 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -850,9 +850,6 @@ ARG INSTALL_PHALCON=false
 ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
-# Copy phalcon configration
-COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
-
 RUN if [ $INSTALL_PHALCON = true ]; then \
     echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index b45d413d..9ae03ae0 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -313,9 +313,6 @@ ARG INSTALL_PHALCON=false
 ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
-# Copy phalcon configration
-COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
-
 RUN if [ $INSTALL_PHALCON = true ]; then \
     echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 60565b1b..fccfd955 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1321,9 +1321,6 @@ ARG INSTALL_PHALCON=false
 ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
-# Copy phalcon configration
-COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
-
 RUN if [ $INSTALL_PHALCON = true ]; then \
     echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \

From 72d8ec8f21280f3da9f5b24c8fa34357908a33fc Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:17:24 +0800
Subject: [PATCH 03/13] fixed

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

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index c71118f9..3ed7df58 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -851,7 +851,8 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    apt-get install libpcre3-dev; \
+    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && 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 \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 9ae03ae0..00ee062d 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -314,7 +314,8 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    apt-get install libpcre3-dev; \
+    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && 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 \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index fccfd955..e64dc7c9 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1322,7 +1322,8 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    apt-get install libpcre3-dev; \
+    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && 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 \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \

From 369a5040d432a6f189435cdf380dcc3adf2e82e6 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:19:13 +0800
Subject: [PATCH 04/13] fixed

---
 php-fpm/Dockerfile    | 1 +
 php-worker/Dockerfile | 1 +
 workspace/Dockerfile  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 3ed7df58..182d382c 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -852,6 +852,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get install libpcre3-dev; \
+    && pecl channel-update pecl.php.net; \
     && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && 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 \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 00ee062d..09a2c9e3 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -315,6 +315,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get install libpcre3-dev; \
+    && pecl channel-update pecl.php.net; \
     && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && 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 \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index e64dc7c9..043acace 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1323,6 +1323,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get install libpcre3-dev; \
+    && pecl channel-update pecl.php.net; \
     && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
     && 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 \

From ff48d295f64b043afdc9f2ba8265e1e6c669d2eb Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:22:10 +0800
Subject: [PATCH 05/13] fixed

---
 php-fpm/Dockerfile    |  4 ++--
 php-worker/Dockerfile | 12 ++++++------
 workspace/Dockerfile  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 182d382c..6c49d2ef 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -851,9 +851,9 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get install libpcre3-dev; \
+    apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
     && 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 \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 09a2c9e3..5d8a474c 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -314,13 +314,13 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get install libpcre3-dev; \
+    apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
-    && 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 \
-    && 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 \
+    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
+    && 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; \
+    && 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 \
 ;fi
 
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 043acace..2eaeb3d7 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1322,9 +1322,9 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get install libpcre3-dev; \
+    apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-${LARADOCK_PHALCON_VERSION} ; \
+    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
     && 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 \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \

From edf4baac444aedadfb3be6b9aa3900e6b1c79b22 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:23:21 +0800
Subject: [PATCH 06/13] fixed

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

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 6c49d2ef..d726bcc2 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -853,7 +853,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
+    && echo '' | 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 \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 5d8a474c..a45cf33c 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -316,7 +316,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
+    && echo '' | 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; \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 2eaeb3d7..386322ba 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1324,7 +1324,7 @@ ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 RUN if [ $INSTALL_PHALCON = true ]; then \
     apt-get -yqq install libpcre3-dev; \
     && pecl channel-update pecl.php.net; \
-    && echo '' | pecl install phalcon-{LARADOCK_PHALCON_VERSION} ; \
+    && echo '' | 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 \
     && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \

From 818488b8620da0bebe912644f1dc0097839c6566 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 09:30:59 +0800
Subject: [PATCH 07/13] fixed

---
 php-fpm/Dockerfile    | 19 ++++++++++---------
 php-worker/Dockerfile | 19 ++++++++++---------
 workspace/Dockerfile  | 19 ++++++++++---------
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index d726bcc2..94236b68 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -851,15 +851,16 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get -yqq install libpcre3-dev; \
-    && pecl channel-update pecl.php.net; \
-    && echo '' | 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 \
-    && 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 \
-;fi
+      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 \
+      && 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 \
+  ;fi
 
 ###########################################################################
 # APCU:
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index a45cf33c..908fcc57 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -314,15 +314,16 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get -yqq install libpcre3-dev; \
-    && pecl channel-update pecl.php.net; \
-    && echo '' | 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; \
-    && 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 \
-;fi
+      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 \
+      && 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 \
+  ;fi
 
 ARG INSTALL_GHOSTSCRIPT=false
 RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 386322ba..cccd8268 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1322,15 +1322,16 @@ ARG LARADOCK_PHALCON_VERSION
 ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 
 RUN if [ $INSTALL_PHALCON = true ]; then \
-    apt-get -yqq install libpcre3-dev; \
-    && pecl channel-update pecl.php.net; \
-    && echo '' | 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 \
-    && 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 \
-;fi
+      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 \
+      && 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 \
+  ;fi
 
 ###########################################################################
 USER root

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 08/13] 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 \

From e4fe092f26db7fb60d033e55fa53468d3f74ca56 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 11:31:56 +0800
Subject: [PATCH 09/13] fixed

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

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 34f2f6aa..f867d4cf 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -855,9 +855,9 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       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 \
+      # 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 \
   ;fi
 
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 359f24c8..63ebfc5f 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -318,9 +318,9 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       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 \
+      # 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 \
   ;fi
 
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index d1c18cf4..dddaa9ac 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1326,9 +1326,9 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       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 \
+      # 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 \
   ;fi
 

From 68f63646468356915c0f901640854968aa521f3c Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 11:56:31 +0800
Subject: [PATCH 10/13] fixed

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

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index f867d4cf..ffb9a0f8 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -858,7 +858,7 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       # 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 \
+      docker-php-ext-enable phalcon \
   ;fi
 
 ###########################################################################
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index 63ebfc5f..a0eb12e6 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -321,7 +321,7 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       # 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 \
+      docker-php-ext-enable phalcon \
   ;fi
 
 ARG INSTALL_GHOSTSCRIPT=false
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index dddaa9ac..b2086c1b 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1329,7 +1329,7 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       # 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 \
+      docker-php-ext-enable phalcon \
   ;fi
 
 ###########################################################################

From 2e31c037cd95835beb25a988f7ae79f96a0a2bb4 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 13:03:28 +0800
Subject: [PATCH 11/13] fixed

---
 php-fpm/Dockerfile    | 3 ---
 php-worker/Dockerfile | 8 +++-----
 workspace/Dockerfile  | 8 ++++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index ffb9a0f8..d962fdc2 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -855,9 +855,6 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       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 \
   ;fi
 
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index a0eb12e6..d384c017 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -318,11 +318,9 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       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 \
-  ;fi
+      docker-php-ext-enable phalcon; \
+      php -m | grep -q 'phalcon' \
+    ;fi
 
 ARG INSTALL_GHOSTSCRIPT=false
 RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index b2086c1b..d650d7e1 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1326,10 +1326,10 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       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 \
+      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; \
+      php -m | grep -q 'phalcon'; \
   ;fi
 
 ###########################################################################

From 59bf17ffcc783fa7da6e7e8881e82e574f7ebe46 Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Tue, 27 Sep 2022 13:04:33 +0800
Subject: [PATCH 12/13] fixed

---
 workspace/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index d650d7e1..90495fcd 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1329,7 +1329,7 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       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; \
-      php -m | grep -q 'phalcon'; \
+      php -m | grep -q 'phalcon' \
   ;fi
 
 ###########################################################################

From 06ff2a34a074e0364056f2f0f8b997d880bb6b2e Mon Sep 17 00:00:00 2001
From: kideny <kideny@msn.com>
Date: Wed, 5 Oct 2022 19:05:19 +0800
Subject: [PATCH 13/13] fixed

---
 workspace/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 90495fcd..05a0bb2b 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1326,9 +1326,8 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
       && pecl channel-update pecl.php.net \
       && apt-get install -yqq libpcre3-dev; \
       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; \
+      ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/50-phalcon.ini; \
       php -m | grep -q 'phalcon' \
   ;fi