From 7f00748ee92f0295f58c5c9699a4b76c14f73c57 Mon Sep 17 00:00:00 2001 From: STAM Date: Mon, 31 Jul 2023 12:43:15 +0300 Subject: [PATCH] php7.0 fix --- linux/ecosystem/apache2/php7.0/Dockerfile | 6 +-- linux/ecosystem/php/php7.0/Dockerfile | 48 +++++++++++------------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/linux/ecosystem/apache2/php7.0/Dockerfile b/linux/ecosystem/apache2/php7.0/Dockerfile index d395f9d6d..478fe4045 100644 --- a/linux/ecosystem/apache2/php7.0/Dockerfile +++ b/linux/ecosystem/apache2/php7.0/Dockerfile @@ -65,9 +65,9 @@ RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf ############################################################################## # Cassandra PHP Drivers Install ############################################################################## -RUN ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ - php -m && \ - php -v +#RUN ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ +# php -m && \ +# php -v ################################################################## # Installing IOnCube addon diff --git a/linux/ecosystem/php/php7.0/Dockerfile b/linux/ecosystem/php/php7.0/Dockerfile index 0c4496352..741e846b9 100644 --- a/linux/ecosystem/php/php7.0/Dockerfile +++ b/linux/ecosystem/php/php7.0/Dockerfile @@ -195,35 +195,35 @@ RUN phpenmod \ ############################################################################## # Cassandra CPP Support Install ############################################################################## -COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb -RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ - https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ - https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ - https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ - https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ - https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ - https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb +#COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +#RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36" --directory-prefix=/tmp/cassandra-php-driver \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dev_1.35.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1-dbg_1.35.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver-dev_2.16.0-1_amd64.deb \ +# https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.16.0/cassandra-cpp-driver_2.16.0-1_amd64.deb -RUN cd /tmp/cassandra-php-driver && \ - dpkg -i ./multiarch-support_2.28_amd64.deb && \ - dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ - dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ - dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ - dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ - dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ - dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb +#RUN cd /tmp/cassandra-php-driver && \ +# dpkg -i ./multiarch-support_2.28_amd64.deb && \ +# dpkg -i ./libuv1_1.35.0-1_amd64.deb && \ +# dpkg -i ./libuv1-dev_1.35.0-1_amd64.deb && \ +# dpkg -i ./libuv1-dbg_1.35.0-1_amd64.deb && \ +# dpkg -i ./cassandra-cpp-driver_2.16.0-1_amd64.deb && \ +# dpkg -i ./cassandra-cpp-driver-dev_2.16.0-1_amd64.deb && \ +# dpkg -i ./cassandra-cpp-driver-dbg_2.16.0-1_amd64.deb ############################################################################## # Cassandra PHP Drivers Install ############################################################################## -RUN pecl install cassandra && \ - echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ - ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ - ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ - ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ -# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ - php -m && \ - php -v +#RUN pecl install cassandra && \ +# echo "extension = ${PHP_MODULE_PATH}/cassandra.so" > ${CAS_PHP_INI} && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cgi/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/cli/conf.d/cassandra.ini && \ +# ln -sf ${CAS_PHP_INI} ${PHP_DIR}/fpm/conf.d/cassandra.ini && \ +## ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ +# php -m && \ +# php -v ################################################################## # Installing timezonedb addon