Merge pull request #2924 from laradock/php56-not-support-decimal
php 5.6 skip install deciman extension
This commit is contained in:
		| @@ -1078,10 +1078,14 @@ USER root | |||||||
| ARG INSTALL_PHPDECIMAL=false | ARG INSTALL_PHPDECIMAL=false | ||||||
|  |  | ||||||
| RUN if [ ${INSTALL_PHPDECIMAL} = true ]; then \ | RUN if [ ${INSTALL_PHPDECIMAL} = true ]; then \ | ||||||
|     apt-get update -yqq \ |     if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ | ||||||
|     && apt-get install -y libmpdec-dev \ |       echo 'decimal not support PHP 5.6'; \ | ||||||
|     && pecl install decimal \ |     else \ | ||||||
|     && docker-php-ext-enable decimal \ |       apt-get install -yqq libmpdec-dev \ | ||||||
|  |       && pecl install decimal \ | ||||||
|  |       && docker-php-ext-enable decimal \ | ||||||
|  |       && php -m | grep -q 'decimal' \ | ||||||
|  |     ;fi \ | ||||||
| ;fi | ;fi | ||||||
|  |  | ||||||
| ########################################################################### | ########################################################################### | ||||||
|   | |||||||
| @@ -1588,12 +1588,15 @@ USER root | |||||||
| ARG INSTALL_PHPDECIMAL=false | ARG INSTALL_PHPDECIMAL=false | ||||||
|  |  | ||||||
| RUN if [ ${INSTALL_PHPDECIMAL} = true ]; then \ | RUN if [ ${INSTALL_PHPDECIMAL} = true ]; then \ | ||||||
|     apt-get update -yqq \ |     if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ | ||||||
|     && apt-get install -y libmpdec-dev \ |       echo 'decimal not support PHP 5.6'; \ | ||||||
|     && pecl install decimal \ |     else \ | ||||||
|     && echo "extension=decimal.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/decimal.ini \ |       apt-get install -yqq libmpdec-dev \ | ||||||
|     && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/decimal.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-decimal.ini \ |       && pecl install decimal \ | ||||||
|     && php -m | grep -q 'decimal' \ |       && echo "extension=decimal.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/decimal.ini \ | ||||||
|  |       && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/decimal.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-decimal.ini \ | ||||||
|  |       && php -m | grep -q 'decimal' \ | ||||||
|  |     ;fi \ | ||||||
| ;fi | ;fi | ||||||
|  |  | ||||||
| # | # | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Shao Yu-Lung (Allen)
					Shao Yu-Lung (Allen)