diff --git a/Dockerfile-5.x b/Dockerfile-5.x index be8a7c06a2f566c4fe6229bb137426a38efe27d1..5af88d161e8ac1d29c942c85544534dcef99adef 100644 --- a/Dockerfile-5.x +++ b/Dockerfile-5.x @@ -114,21 +114,6 @@ ADD ${PHP_CONF_LOCAL_DIR}/opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/90-opcache.ini ADD ${PHP_CONF_LOCAL_DIR}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/91-unicaen.ini ADD ${PHP_CONF_LOCAL_DIR}/xdebug.conf ${PHP_CONF_DIR}/fpm/conf.d/92-xdebug.ini -# Package PHP Oracle OCI8 -ADD resources/instantclient-basiclite-linux.x64-12.2.0.1.0.zip /tmp/ -ADD resources/instantclient-sdk-linux.x64-12.2.0.1.0.zip /tmp/ -ADD resources/instantclient-sqlplus-linux.x64-12.2.0.1.0.zip /tmp/ -RUN unzip -o /tmp/instantclient-basiclite-linux.x64-12.2.0.1.0.zip -d /usr/local/ && \ - unzip -o /tmp/instantclient-sdk-linux.x64-12.2.0.1.0.zip -d /usr/local/ && \ - unzip -o /tmp/instantclient-sqlplus-linux.x64-12.2.0.1.0.zip -d /usr/local/ && \ - ln -s /usr/local/instantclient_12_2 /usr/local/instantclient && \ - ln -s /usr/local/instantclient/libclntsh.so.12.1 /usr/local/instantclient/libclntsh.so && \ - ln -s /usr/local/instantclient/sqlplus /usr/bin/sqlplus && \ - echo 'instantclient,/usr/local/instantclient' | pecl install ${OCI8_PACKAGE} && \ - echo "extension=oci8.so" > ${PHP_CONF_DIR}/fpm/conf.d/30-php-oci8.ini && \ - echo "extension=oci8.so" > ${PHP_CONF_DIR}/cli/conf.d/30-php-oci8.ini && \ - echo "/usr/local/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig - # Apache RUN a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \ a2dismod mpm_event && a2enmod mpm_worker diff --git a/Dockerfile-5.x.sh b/Dockerfile-5.x.sh index 7a0b9b92194c31535ecf1609bbf8b1d914270d8f..724bfa07ad7194bb38bb905a9f1eafd79becd29e 100755 --- a/Dockerfile-5.x.sh +++ b/Dockerfile-5.x.sh @@ -111,22 +111,6 @@ cp ${PHP_CONF_LOCAL_DIR}/opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/90-opcache.ini cp ${PHP_CONF_LOCAL_DIR}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/91-unicaen.ini cp ${PHP_CONF_LOCAL_DIR}/xdebug.conf ${PHP_CONF_DIR}/fpm/conf.d/92-xdebug.ini -# Package PHP Oracle OCI8 -#pear config-set http_proxy "${http_proxy}" -cp resources/instantclient-basiclite-linux.x64-12.2.0.1.0.zip /tmp/ -cp resources/instantclient-sdk-linux.x64-12.2.0.1.0.zip /tmp/ -cp resources/instantclient-sqlplus-linux.x64-12.2.0.1.0.zip /tmp/ -unzip -o /tmp/instantclient-basiclite-linux.x64-12.2.0.1.0.zip -d /usr/local/ && \ -unzip -o /tmp/instantclient-sdk-linux.x64-12.2.0.1.0.zip -d /usr/local/ && \ -unzip -o /tmp/instantclient-sqlplus-linux.x64-12.2.0.1.0.zip -d /usr/local/ && \ -ln -s /usr/local/instantclient_12_2 /usr/local/instantclient && \ -ln -s /usr/local/instantclient/libclntsh.so.12.1 /usr/local/instantclient/libclntsh.so && \ -ln -s /usr/local/instantclient/sqlplus /usr/local/bin/sqlplus && \ -echo 'instantclient,/usr/local/instantclient' | pecl install ${OCI8_PACKAGE} && \ -echo "extension=oci8.so" > ${PHP_CONF_DIR}/fpm/conf.d/30-php-oci8.ini && \ -echo "extension=oci8.so" > ${PHP_CONF_DIR}/cli/conf.d/30-php-oci8.ini && \ -echo "/usr/local/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig - # Apache a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \ a2dismod mpm_event mpm_prefork && a2enmod mpm_worker diff --git a/resources/instantclient-basiclite-linux.x64-12.2.0.1.0.zip b/resources/instantclient-basiclite-linux.x64-12.2.0.1.0.zip deleted file mode 100755 index e090e5a7830ab16f96341b0958797d5bf2f8398e..0000000000000000000000000000000000000000 Binary files a/resources/instantclient-basiclite-linux.x64-12.2.0.1.0.zip and /dev/null differ diff --git a/resources/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip b/resources/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip deleted file mode 100644 index 0a4ded8794e68aa8e557f43682b3f86592b3a77e..0000000000000000000000000000000000000000 Binary files a/resources/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip and /dev/null differ diff --git a/resources/instantclient-sdk-linux.x64-12.2.0.1.0.zip b/resources/instantclient-sdk-linux.x64-12.2.0.1.0.zip deleted file mode 100755 index 243ccda9a562cebcb7efa91a30c7c312f8f45d73..0000000000000000000000000000000000000000 Binary files a/resources/instantclient-sdk-linux.x64-12.2.0.1.0.zip and /dev/null differ diff --git a/resources/instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip b/resources/instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip deleted file mode 100644 index 9805b9a0dee24ff76b05209600f7436076dd54a2..0000000000000000000000000000000000000000 Binary files a/resources/instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip and /dev/null differ diff --git a/resources/instantclient-sqlplus-linux.x64-12.2.0.1.0.zip b/resources/instantclient-sqlplus-linux.x64-12.2.0.1.0.zip deleted file mode 100755 index c721cfd19ae437ddb8ad68f091946b703936a56a..0000000000000000000000000000000000000000 Binary files a/resources/instantclient-sqlplus-linux.x64-12.2.0.1.0.zip and /dev/null differ diff --git a/resources/instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip b/resources/instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip deleted file mode 100644 index a0627c32722df915564a453a1554319eb1659aa2..0000000000000000000000000000000000000000 Binary files a/resources/instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip and /dev/null differ