Commit 20dae336 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

AJout d'un numéro aux noms de fichiers de config OCI pour garantir l'ordre de chargement.

parent de571ccb
Loading
Loading
Loading
Loading
+2 −2
Changes for Dockerfile: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ RUN unzip -o /tmp/instantclient-basiclite-linux.x64-12.2.0.1.0.zip -d /usr/local
    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 && \
    echo "extension=oci8.so" > ${PHP_CONF_DIR}/fpm/conf.d/php-oci8.ini && \
    echo "extension=oci8.so" > ${PHP_CONF_DIR}/cli/conf.d/php-oci8.ini && \
    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

RUN a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \
+2 −2
Changes for Dockerfile.sh: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ 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 && \
echo "extension=oci8.so" > ${PHP_CONF_DIR}/fpm/conf.d/php-oci8.ini && \
echo "extension=oci8.so" > ${PHP_CONF_DIR}/cli/conf.d/php-oci8.ini && \
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

a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \