diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index ffb9a0f..d962fdc 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 a0eb12e..d384c01 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 b2086c1..d650d7e 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 ###########################################################################