diff --git a/.env.example b/.env.example index e19fdad4..564790bc 100644 --- a/.env.example +++ b/.env.example @@ -173,7 +173,7 @@ WORKSPACE_INSTALL_SWOOLE=false WORKSPACE_INSTALL_TAINT=false WORKSPACE_INSTALL_LIBPNG=false WORKSPACE_INSTALL_GRAPHVIZ=false -WORKSPACE_INSTALL_IONCUBE=false # PHP 8.0 is not supported yet. Reference: https://forum.ioncube.com/viewtopic.php?t=4592 +WORKSPACE_INSTALL_IONCUBE=false # PHP 8.2 is not supported yet. WORKSPACE_INSTALL_MYSQL_CLIENT=false WORKSPACE_INSTALL_PING=false WORKSPACE_INSTALL_SSHPASS=false @@ -261,7 +261,7 @@ PHP_FPM_INSTALL_POSTGIS=false PHP_FPM_INSTALL_PCNTL=false PHP_FPM_INSTALL_CALENDAR=false PHP_FPM_INSTALL_FAKETIME=false -PHP_FPM_INSTALL_IONCUBE=false # PHP 8.0 is not supported yet. Reference: https://forum.ioncube.com/viewtopic.php?t=4592 +PHP_FPM_INSTALL_IONCUBE=false # PHP 8.2 is not supported yet. PHP_FPM_INSTALL_RDKAFKA=false PHP_FPM_INSTALL_GETTEXT=false PHP_FPM_INSTALL_XMLRPC=false diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index ac15ca9a..23f2c336 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -655,7 +655,13 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") != "8" ]; then \ + if [ ${LARADOCK_PHP_VERSION} = "8.1" ] \ + || [ ${LARADOCK_PHP_VERSION} = "7.4" ] \ + || [ ${LARADOCK_PHP_VERSION} = "7.3" ] \ + || [ ${LARADOCK_PHP_VERSION} = "7.2" ] \ + || [ ${LARADOCK_PHP_VERSION} = "7.1" ] \ + || [ ${LARADOCK_PHP_VERSION} = "7.0" ] \ + || [ ${LARADOCK_PHP_VERSION} = "5.6" ]; then \ # Install the php ioncube loader curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \ && tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \ diff --git a/workspace/Dockerfile b/workspace/Dockerfile index db7eee53..b4ec4b5f 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -691,7 +691,13 @@ RUN if [ ${INSTALL_GRAPHVIZ} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") != "8" ]; then \ + if [ ${LARADOCK_PHP_VERSION} = "8.1" ] \ + || [ ${LARADOCK_PHP_VERSION} = "7.4" ] \ + || [ ${LARADOCK_PHP_VERSION} = "7.3" ] \ + || [ ${LARADOCK_PHP_VERSION} = "7.2" ] \ + || [ ${LARADOCK_PHP_VERSION} = "7.1" ] \ + || [ ${LARADOCK_PHP_VERSION} = "7.0" ] \ + || [ ${LARADOCK_PHP_VERSION} = "5.6" ]; then \ # Install the php ioncube loader curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \ && tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \