From 04f071555cbff3c24736fde9e3e08befd2758731 Mon Sep 17 00:00:00 2001
From: Frank Yuan <kideny@users.noreply.github.com>
Date: Thu, 10 Jan 2019 10:56:30 +0800
Subject: [PATCH] fixed php-fpm install phalcon ext bug (#1811)

* add phalcon ext
* fixed phalcon install
* update index.md
* php-worker install phalcon ext
---
 docker-compose.yml    |  2 ++
 env-example           |  1 +
 php-fpm/Dockerfile    |  5 +++--
 php-fpm/phalcon.ini   |  1 +
 php-worker/Dockerfile | 15 +++++++++++++++
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 php-fpm/phalcon.ini

diff --git a/docker-compose.yml b/docker-compose.yml
index f042c277..df11146b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -185,8 +185,10 @@ services:
         context: ./php-worker
         args:
           - PHP_VERSION=${PHP_VERSION}
+          - PHALCON_VERSION=${PHALCON_VERSION}
           - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL}
           - INSTALL_BCMATH=${PHP_WORKER_INSTALL_BCMATH}
+          - INSTALL_PHALCON=${PHP_WORKER_INSTALL_PHALCON}
           - INSTALL_SOAP=${PHP_WORKER_INSTALL_SOAP}
           - INSTALL_ZIP_ARCHIVE=${PHP_WORKER_INSTALL_ZIP_ARCHIVE}
           - PUID=${PHP_WORKER_PUID}
diff --git a/env-example b/env-example
index 5767720e..e67eabbe 100644
--- a/env-example
+++ b/env-example
@@ -170,6 +170,7 @@ PHP_FPM_INSTALL_YAML=false
 
 PHP_WORKER_INSTALL_PGSQL=false
 PHP_WORKER_INSTALL_BCMATH=false
+PHP_WORKER_INSTALL_PHALCON=false
 PHP_WORKER_INSTALL_SOAP=false
 PHP_WORKER_INSTALL_ZIP_ARCHIVE=false
 PHP_WORKER_PUID=1000
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 05925259..641d0eab 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -536,11 +536,12 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
     && unzip -d /tmp/ /tmp/cphalcon.zip \
     && cd /tmp/cphalcon-${LARADOCK_PHALCON_VERSION}/build \
     && ./install \
-    && 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* \
 ;fi
 
+# Copy phalcon configration
+COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini
+
 ###########################################################################
 # APCU:
 ###########################################################################
diff --git a/php-fpm/phalcon.ini b/php-fpm/phalcon.ini
new file mode 100644
index 00000000..24b58bad
--- /dev/null
+++ b/php-fpm/phalcon.ini
@@ -0,0 +1 @@
+extension=phalcon.so
\ No newline at end of file
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index fadfb80a..590159bc 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -16,6 +16,7 @@ RUN apk --update add wget \
   libmemcached-dev \
   libmcrypt-dev \
   libxml2-dev \
+  pcre-dev \
   zlib-dev \
   autoconf \
   cyrus-sasl-dev \
@@ -65,6 +66,20 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
 RUN rm /var/cache/apk/* \
     && mkdir -p /var/www
 
+# Install Phalcon ext
+ARG INSTALL_PHALCON=false
+ARG PHALCON_VERSION
+ENV PHALCON_VERSION ${PHALCON_VERSION}
+
+RUN if [ $INSTALL_PHALCON = true ]; then \
+    apk --update add unzip gcc make re2c bash\
+    && 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
+
 #
 #--------------------------------------------------------------------------
 # Optional Supervisord Configuration