From 9a451684f2949c5cf3c5b21e9d07f164c6e6caa9 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Sat, 9 Oct 2021 10:44:21 +0800 Subject: [PATCH 1/2] up php default version to 7.4 --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 78fb7f1a..248bcb19 100644 --- a/.env.example +++ b/.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). # 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 ########################################### From d5e990caba08a62d54cedbf834348539cd6fc621 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Sat, 9 Oct 2021 10:45:57 +0800 Subject: [PATCH 2/2] php-fpm: add ionCube Loader enabled check --- php-fpm/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 1f99e726..06fa37cd 100644 --- a/php-fpm/Dockerfile +++ b/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 \ && 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