From 2cc022b112e825330a72e8e526cbc4841f57451b Mon Sep 17 00:00:00 2001 From: Andre Kutianski Date: Sat, 10 Jun 2023 19:01:44 -0300 Subject: [PATCH] fix: oci8 fails install on PHP 8.1 Oracle OCI8 fails to install on PHP 8.1 due the new release available, created conditional to check compatibility. --- php-fpm/Dockerfile | 2 ++ workspace/Dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 23f2c336..2ea04eb7 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -637,6 +637,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ echo 'instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/' | pecl install oci8-2.2.0; \ elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8-3.0.1; \ + elif [ $(php -r "echo PHP_MAJOR_VERSION . PHP_MINOR_VERSION;") = "81" ]; then \ + echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8-3.2.1; \ else \ echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8; \ fi \ diff --git a/workspace/Dockerfile b/workspace/Dockerfile index b4ec4b5f..f0f9ba33 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -962,6 +962,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ echo 'instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/' | pecl install oci8-2.2.0; \ elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80000" ]; then \ echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8-3.0.1; \ + elif [ $(php -r "echo PHP_MAJOR_VERSION . PHP_MINOR_VERSION;") = "81" ]; then \ + echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8-3.2.1; \ else \ echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8; \ fi \