瀏覽代碼

Merge pull request #3074 from bestlong/check-fpm-ioncube

Add php-fpm ioncube install check
Shao Yu-Lung (Allen) 3 年之前
父節點
當前提交
50146d5732
共有 2 個文件被更改,包括 2 次插入1 次删除
  1. 1 1
      .env.example
  2. 1 0
      php-fpm/Dockerfile

+ 1 - 1
.env.example

@@ -39,7 +39,7 @@ COMPOSE_PROJECT_NAME=laradock
 
 
 # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
 # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
 # Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
 # Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
-PHP_VERSION=7.3
+PHP_VERSION=7.4
 
 
 ### Phalcon Version ###########################################
 ### Phalcon Version ###########################################
 
 

+ 1 - 0
php-fpm/Dockerfile

@@ -636,6 +636,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 \
       && 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 \
       && printf "zend_extension=ioncube_loader.so\n" > $PHP_INI_DIR/conf.d/0ioncube.ini \
       && rm -rf /tmp/ioncube* \
       && rm -rf /tmp/ioncube* \
+      && php -m | grep -oiE '^ionCube Loader$' \
     ;fi \
     ;fi \
 ;fi
 ;fi