ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3280 from kideny/phalcon 

Fix Phalcon Support
This commit is contained in:
Shao Yu-Lung (Allen) 2022-10-23 13:40:43 +08:00 committed by GitHub
parent 2ff93b5e55 06ff2a34a0
commit 4ff41ecfc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.example
View File

@ -43,8 +43,8 @@ PHP_VERSION=7.4
### Phalcon Version ########################################### ### Phalcon Version ###########################################
# Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 3.4.0+ # Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 5.0.0+
PHALCON_VERSION=4.0.5 PHALCON_VERSION=5.0.0
### PHP Interpreter ####################################### ### PHP Interpreter #######################################

24
php-fpm/Dockerfile
View File

@ -851,25 +851,13 @@ ARG INSTALL_PHALCON=false
ARG LARADOCK_PHALCON_VERSION ARG LARADOCK_PHALCON_VERSION
ENV LARADOCK_PHALCON_VERSION ${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 \ RUN if [ $INSTALL_PHALCON = true ]; then \
apt-get install -yqq unzip libpcre3-dev gcc make re2c git automake autoconf\ apt-get update -yqq \
&& git clone https://github.com/jbboehr/php-psr.git \ && pecl channel-update pecl.php.net \
&& cd php-psr \ && apt-get install -yqq libpcre3-dev; \
&& phpize \ pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
&& ./configure \ docker-php-ext-enable phalcon \
&& make \ ;fi
&& 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 \
&& mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
&& rm -rf /tmp/cphalcon* \
;fi
########################################################################### ###########################################################################
# APCU: # APCU:

25
php-worker/Dockerfile
View File

@ -310,24 +310,17 @@ RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
# Install Phalcon ext # Install Phalcon ext
ARG INSTALL_PHALCON=false ARG INSTALL_PHALCON=false
ARG PHALCON_VERSION ARG LARADOCK_PHALCON_VERSION
ENV PHALCON_VERSION ${PHALCON_VERSION} ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
RUN if [ $INSTALL_PHALCON = true ]; then \ RUN if [ $INSTALL_PHALCON = true ]; then \
apk --update add unzip gcc make re2c bash\ apt-get update -yqq \
&& git clone https://github.com/jbboehr/php-psr.git \ && pecl channel-update pecl.php.net \
&& cd php-psr \ && apt-get install -yqq libpcre3-dev; \
&& phpize \ pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
&& ./configure \ docker-php-ext-enable phalcon; \
&& make \ php -m | grep -q 'phalcon' \
&& make test \ ;fi
&& 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
ARG INSTALL_GHOSTSCRIPT=false ARG INSTALL_GHOSTSCRIPT=false
RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \ RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \

25
workspace/Dockerfile
View File

@ -1323,23 +1323,14 @@ ARG LARADOCK_PHALCON_VERSION
ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION} ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
RUN if [ $INSTALL_PHALCON = true ]; then \ RUN if [ $INSTALL_PHALCON = true ]; then \
apt-get update && apt-get install -yqq unzip libpcre3-dev gcc make re2c git automake autoconf\ apt-get update -yqq \
&& git clone https://github.com/jbboehr/php-psr.git \ && pecl channel-update pecl.php.net \
&& cd php-psr \ && apt-get install -yqq libpcre3-dev; \
&& phpize \ pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
&& ./configure \ echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
&& make \ ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/50-phalcon.ini; \
&& make test \ php -m | grep -q 'phalcon' \
&& make install \ ;fi
&& 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 "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* \
;fi
########################################################################### ###########################################################################
USER root USER root