From 1527c399fd1c2e48242da478d8c3eb83acd18eec Mon Sep 17 00:00:00 2001 From: "Ronnel R. Martinez" Date: Sun, 7 May 2023 01:28:15 +0800 Subject: [PATCH 1/5] update: ioncube support for 8.0 and 8.1 --- .env.example | 4 ++-- php-fpm/Dockerfile | 2 +- workspace/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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..e9ce53f5 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -655,7 +655,7 @@ 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.2" ]; 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..bbd6a159 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -691,7 +691,7 @@ 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.2" ]; 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 \ From 4f1027bc59e98ee2af7f2e2da49e90a3f750a65d Mon Sep 17 00:00:00 2001 From: "Ronnel R. Martinez" Date: Sun, 7 May 2023 01:52:01 +0800 Subject: [PATCH 2/5] update: change operator --- php-fpm/Dockerfile | 2 +- workspace/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index e9ce53f5..de161e4b 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -655,7 +655,7 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - if [ ${LARADOCK_PHP_VERSION} != "8.2" ]; then \ + if [ ${LARADOCK_PHP_VERSION} >= "8.2" ]; 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 bbd6a159..f127f35a 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -691,7 +691,7 @@ RUN if [ ${INSTALL_GRAPHVIZ} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - if [ ${LARADOCK_PHP_VERSION} != "8.2" ]; then \ + if [ ${LARADOCK_PHP_VERSION} >= "8.2" ]; 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 \ From c4605098329e5d068559d0902e1fef4cb47d6dd6 Mon Sep 17 00:00:00 2001 From: "Ronnel R. Martinez" Date: Sun, 7 May 2023 01:54:15 +0800 Subject: [PATCH 3/5] update: operator --- php-fpm/Dockerfile | 2 +- workspace/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index de161e4b..f12fe17d 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -655,7 +655,7 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - if [ ${LARADOCK_PHP_VERSION} >= "8.2" ]; then \ + if [ ${LARADOCK_PHP_VERSION} < "8.2" ]; 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 f127f35a..45d7f747 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -691,7 +691,7 @@ RUN if [ ${INSTALL_GRAPHVIZ} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - if [ ${LARADOCK_PHP_VERSION} >= "8.2" ]; then \ + if [ ${LARADOCK_PHP_VERSION} < "8.2" ]; 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 \ From 95c0da664dc3f43b3fd78f450879c89bb5de26ac Mon Sep 17 00:00:00 2001 From: "Ronnel R. Martinez" Date: Sun, 7 May 2023 02:38:54 +0800 Subject: [PATCH 4/5] update: fix condition --- php-fpm/Dockerfile | 9 ++++++++- workspace/Dockerfile | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index f12fe17d..2c0403a1 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -655,7 +655,14 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - if [ ${LARADOCK_PHP_VERSION} < "8.2" ]; then \ + if [ ${LARADOCK_PHP_VERSION} = "8.1" ] \ + || [ ${LARADOCK_PHP_VERSION} = "8.0" ] \ + || [ ${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 45d7f747..751ac58f 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -691,7 +691,14 @@ RUN if [ ${INSTALL_GRAPHVIZ} = true ]; then \ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ - if [ ${LARADOCK_PHP_VERSION} < "8.2" ]; then \ + if [ ${LARADOCK_PHP_VERSION} = "8.1" ] \ + || [ ${LARADOCK_PHP_VERSION} = "8.0" ] \ + || [ ${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 \ From fecb7f032ed86b8afca4418d8d25fcd2b950691e Mon Sep 17 00:00:00 2001 From: "Ronnel R. Martinez" Date: Tue, 9 May 2023 09:17:37 +0800 Subject: [PATCH 5/5] update: remove php 8.0 --- php-fpm/Dockerfile | 1 - workspace/Dockerfile | 1 - 2 files changed, 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 2c0403a1..23f2c336 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -656,7 +656,6 @@ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ if [ ${LARADOCK_PHP_VERSION} = "8.1" ] \ - || [ ${LARADOCK_PHP_VERSION} = "8.0" ] \ || [ ${LARADOCK_PHP_VERSION} = "7.4" ] \ || [ ${LARADOCK_PHP_VERSION} = "7.3" ] \ || [ ${LARADOCK_PHP_VERSION} = "7.2" ] \ diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 751ac58f..b4ec4b5f 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -692,7 +692,6 @@ ARG INSTALL_IONCUBE=false RUN if [ ${INSTALL_IONCUBE} = true ]; then \ if [ ${LARADOCK_PHP_VERSION} = "8.1" ] \ - || [ ${LARADOCK_PHP_VERSION} = "8.0" ] \ || [ ${LARADOCK_PHP_VERSION} = "7.4" ] \ || [ ${LARADOCK_PHP_VERSION} = "7.3" ] \ || [ ${LARADOCK_PHP_VERSION} = "7.2" ] \