diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index d0b0419aa..ac75da30c 100644 --- a/.devilbox/www/config.php +++ b/.devilbox/www/config.php @@ -14,7 +14,7 @@ $DEVILBOX_VERSION = 'v0.15'; -$DEVILBOX_DATE = '2018-12-31'; +$DEVILBOX_DATE = '2019-01-02'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; // diff --git a/README.md b/README.md index 9e32ef0e4..da616dc34 100644 --- a/README.md +++ b/README.md @@ -649,6 +649,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module | mysql | ✔ | ✔ | 🗸 | 🗸 | 🗸 | | | | | | | mysqli | ✔ | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | mysqlnd | | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | +| oci8 | | d | d | d | d | d | d | d | d | d | | openssl | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | pcntl | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | pcre | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | @@ -656,6 +657,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module | pdo_dblib | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | PDO_Firebird | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | pdo_mysql | ✔ | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | +| PDO_OCI | | | | | | d | d | d | d | d | | pdo_pgsql | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | pdo_sqlite | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | pdo_sqlsrv | | | | | | d | d | d | d | | diff --git a/cfg/php-startup-7.0/03-oracle-oci8-and-pdo_oci.sh-example b/cfg/php-startup-7.0/03-oracle-oci8-and-pdo_oci.sh-example deleted file mode 100755 index 1091b5ff6..000000000 --- a/cfg/php-startup-7.0/03-oracle-oci8-and-pdo_oci.sh-example +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# -# https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ -# - -# Install 'alien' to install rpm packages -apt-get update -q -DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests alien - -# Instantclient (basic lite) -curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm - -# Instantclient (devel) -curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Install RPMs -rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 -alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm -alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Remove RPMs -rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm -rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Necessary symlinks -ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ - -# Build and install PHP extension oci8 -docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 -docker-php-ext-install oci8 - -# Build and install PHP extension pdo_oci -docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr,18.3 -docker-php-ext-install pdo_oci diff --git a/cfg/php-startup-7.1/03-oracle-oci8-and-pdo_oci.sh-example b/cfg/php-startup-7.1/03-oracle-oci8-and-pdo_oci.sh-example deleted file mode 100755 index 1091b5ff6..000000000 --- a/cfg/php-startup-7.1/03-oracle-oci8-and-pdo_oci.sh-example +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# -# https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ -# - -# Install 'alien' to install rpm packages -apt-get update -q -DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests alien - -# Instantclient (basic lite) -curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm - -# Instantclient (devel) -curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Install RPMs -rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 -alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm -alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Remove RPMs -rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm -rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Necessary symlinks -ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ - -# Build and install PHP extension oci8 -docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 -docker-php-ext-install oci8 - -# Build and install PHP extension pdo_oci -docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr,18.3 -docker-php-ext-install pdo_oci diff --git a/cfg/php-startup-7.2/03-oracle-oci8-and-pdo_oci.sh-example b/cfg/php-startup-7.2/03-oracle-oci8-and-pdo_oci.sh-example deleted file mode 100755 index 9c5bf8bd1..000000000 --- a/cfg/php-startup-7.2/03-oracle-oci8-and-pdo_oci.sh-example +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# -# https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ -# - -# Install 'alien' to install rpm packages -apt-get update -q -DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests alien - -# Instantclient (basic lite) -curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm - -# Instantclient (devel) -curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Install RPMs -rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 -alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm -alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Remove RPMs -rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm -rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Necessary symlinks -ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ - -# Build and install PHP extension oci8 -docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 -docker-php-ext-install oci8 - -# Build and install PHP extension pdo_oci -docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 -docker-php-ext-install pdo_oci diff --git a/cfg/php-startup-7.3/03-oracle-oci8-and-pdo_oci.sh-example b/cfg/php-startup-7.3/03-oracle-oci8-and-pdo_oci.sh-example deleted file mode 100755 index 9c5bf8bd1..000000000 --- a/cfg/php-startup-7.3/03-oracle-oci8-and-pdo_oci.sh-example +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# -# https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ -# - -# Install 'alien' to install rpm packages -apt-get update -q -DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests alien - -# Instantclient (basic lite) -curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm - -# Instantclient (devel) -curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Install RPMs -rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 -alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm -alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Remove RPMs -rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm -rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm - -# Necessary symlinks -ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ - -# Build and install PHP extension oci8 -docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 -docker-php-ext-install oci8 - -# Build and install PHP extension pdo_oci -docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 -docker-php-ext-install pdo_oci diff --git a/docker-compose.yml b/docker-compose.yml index 7a235566e..de086d3e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,7 @@ services: # PHP # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER}-work-0.64 + image: devilbox/php-fpm:${PHP_SERVER}-work-0.65 hostname: php ## diff --git a/docs/configuration-files/env-file.rst b/docs/configuration-files/env-file.rst index fc1690b0a..a283d4c61 100644 --- a/docs/configuration-files/env-file.rst +++ b/docs/configuration-files/env-file.rst @@ -1201,11 +1201,11 @@ PHP_MODULES_DISABLE Disable any PHP modules in a comma separated list. -+-------------------------+--------------------------------------+--------------------------------------+ -| Name | Allowed values | Default value | -+=========================+======================================+======================================+ -| ``PHP_MODULES_DISABLE`` | comma separated list of module names | ``pdo_sqlsrv,sqlsrv,rdkafka,swoole`` | -+-------------------------+--------------------------------------+--------------------------------------+ ++-------------------------+--------------------------------------+---------------------------------------------------+ +| Name | Allowed values | Default value | ++=========================+======================================+===================================================+ +| ``PHP_MODULES_DISABLE`` | comma separated list of module names | ``oci8,PDO_OCI,pdo_sqlsrv,sqlsrv,rdkafka,swoole`` | ++-------------------------+--------------------------------------+---------------------------------------------------+ Example: diff --git a/env-example b/env-example index 760b58c3b..d927b6162 100644 --- a/env-example +++ b/env-example @@ -472,7 +472,7 @@ PHP_MODULES_ENABLE= ### ### PHP_MODULES_DISABLE=xdebug,imagick,swoole ### -PHP_MODULES_DISABLE=pdo_sqlsrv,sqlsrv,rdkafka,swoole +PHP_MODULES_DISABLE=oci8,PDO_OCI,pdo_sqlsrv,sqlsrv,rdkafka,swoole ###