Merge branch 'laradock:master' into master
This commit is contained in:
@ -117,11 +117,7 @@ ARG INSTALL_GNUPG=false
|
||||
|
||||
RUN if [ ${INSTALL_GNUPG} = true ]; then \
|
||||
apt-get -yq install libgpgme-dev; \
|
||||
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
|
||||
pecl install gnupg-1.5.0RC2; \
|
||||
else \
|
||||
pecl install gnupg; \
|
||||
fi; \
|
||||
pecl install gnupg; \
|
||||
docker-php-ext-enable gnupg; \
|
||||
php -m | grep -q 'gnupg'; \
|
||||
fi
|
||||
@ -219,8 +215,9 @@ ARG INSTALL_XDEBUG=false
|
||||
|
||||
RUN if [ ${INSTALL_XDEBUG} = true ]; then \
|
||||
# Install the xdebug extension
|
||||
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
|
||||
pecl install xdebug-3.0.0; \
|
||||
# https://xdebug.org/docs/compat
|
||||
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
|
||||
pecl install xdebug-3.1.2; \
|
||||
else \
|
||||
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
|
||||
pecl install xdebug-2.5.5; \
|
||||
@ -357,13 +354,19 @@ ARG INSTALL_MONGO=false
|
||||
RUN if [ ${INSTALL_MONGO} = true ]; then \
|
||||
# Install the mongodb extension
|
||||
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
|
||||
pecl install mongo && \
|
||||
docker-php-ext-enable mongo \
|
||||
;else \
|
||||
pecl install mongodb && \
|
||||
docker-php-ext-enable mongodb \
|
||||
;fi \
|
||||
;fi
|
||||
pecl install mongo; \
|
||||
docker-php-ext-enable mongo; \
|
||||
php -m | grep -oiE '^mongo$'; \
|
||||
else \
|
||||
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ] ;}; then \
|
||||
pecl install mongodb-1.9.2; \
|
||||
else \
|
||||
pecl install mongodb; \
|
||||
fi; \
|
||||
docker-php-ext-enable mongodb; \
|
||||
php -m | grep -oiE '^mongodb$'; \
|
||||
fi; \
|
||||
fi
|
||||
|
||||
###########################################################################
|
||||
# Xhprof:
|
||||
@ -481,6 +484,23 @@ RUN if [ ${INSTALL_GEARMAN} = true ]; then \
|
||||
docker-php-ext-enable gearman \
|
||||
;fi
|
||||
|
||||
###########################################################################
|
||||
# xlswriter:
|
||||
###########################################################################
|
||||
|
||||
ARG INSTALL_XLSWRITER=false
|
||||
RUN set -eux; \
|
||||
if [ ${INSTALL_XLSWRITER} = true ]; then \
|
||||
# Install Php xlswriter Extension \
|
||||
if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \
|
||||
pecl install xlswriter &&\
|
||||
docker-php-ext-enable xlswriter &&\
|
||||
php -m | grep -q 'xlswriter'; \
|
||||
else \
|
||||
echo "PHP Extension for xlswriter is not supported for PHP 5.0";\
|
||||
fi \
|
||||
;fi
|
||||
|
||||
###########################################################################
|
||||
# pcntl
|
||||
###########################################################################
|
||||
@ -632,6 +652,7 @@ RUN if [ ${INSTALL_IONCUBE} = true ]; then \
|
||||
&& mv /tmp/ioncube/ioncube_loader_lin_${LARADOCK_PHP_VERSION}.so $(php -r "echo ini_get('extension_dir');")/ioncube_loader.so \
|
||||
&& printf "zend_extension=ioncube_loader.so\n" > $PHP_INI_DIR/conf.d/0ioncube.ini \
|
||||
&& rm -rf /tmp/ioncube* \
|
||||
&& php -m | grep -oiE '^ionCube Loader$' \
|
||||
;fi \
|
||||
;fi
|
||||
|
||||
@ -791,7 +812,7 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
||||
ARG INSTALL_SMB=false
|
||||
|
||||
RUN if [ ${INSTALL_SMB} = true ]; then \
|
||||
apt-get install apt-get install -yqq smbclient libsmbclient-dev coreutils && \
|
||||
apt-get install -yqq smbclient libsmbclient-dev coreutils && \
|
||||
pecl install smbclient && \
|
||||
docker-php-ext-enable smbclient \
|
||||
;fi
|
||||
@ -1033,6 +1054,19 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \
|
||||
&& apt -f install \
|
||||
;fi
|
||||
|
||||
#####################################
|
||||
# trader:
|
||||
#####################################
|
||||
|
||||
USER root
|
||||
|
||||
ARG INSTALL_TRADER=false
|
||||
|
||||
RUN if [ ${INSTALL_TRADER} = true ]; then \
|
||||
pecl install trader \
|
||||
&& echo "extension=trader.so" >> $PHP_INI_DIR/conf.d/trader.ini \
|
||||
;fi
|
||||
|
||||
###########################################################################
|
||||
# Mailparse extension:
|
||||
###########################################################################
|
||||
@ -1071,7 +1105,7 @@ ARG INSTALL_XMLRPC=false
|
||||
RUN if [ ${INSTALL_XMLRPC} = true ]; then \
|
||||
apt-get -yq install libxml2-dev; \
|
||||
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
|
||||
pecl install xmlrpc-1.0.0RC2; \
|
||||
pecl install xmlrpc-1.0.0RC3; \
|
||||
docker-php-ext-enable xmlrpc; \
|
||||
else \
|
||||
docker-php-ext-install xmlrpc; \
|
||||
@ -1130,7 +1164,7 @@ ARG NEW_RELIC_KEY=${NEW_RELIC_KEY}
|
||||
ARG NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME}
|
||||
|
||||
RUN if [ ${NEW_RELIC} = true ]; then \
|
||||
curl -L http://download.newrelic.com/php_agent/archive/9.9.0.260/newrelic-php5-9.9.0.260-linux.tar.gz | tar -C /tmp -zx && \
|
||||
curl -L http://download.newrelic.com/php_agent/release/newrelic-php5-9.18.1.303-linux.tar.gz | tar -C /tmp -zx && \
|
||||
export NR_INSTALL_USE_CP_NOT_LN=1 && \
|
||||
export NR_INSTALL_SILENT=1 && \
|
||||
/tmp/newrelic-php5-*/newrelic-install install && \
|
||||
|
Reference in New Issue
Block a user