From 583c30563e5d6680216795f1a96957ab18314c92 Mon Sep 17 00:00:00 2001 From: STAM Date: Mon, 31 Jul 2023 13:03:36 +0300 Subject: [PATCH] cassandra fix --- linux/ecosystem/apache2/php7.0/Dockerfile | 6 +-- linux/ecosystem/php/php7.0/Dockerfile | 48 ++++++++++++----------- linux/ecosystem/php/php7.1/Dockerfile | 2 + linux/ecosystem/php/php7.2/Dockerfile | 2 + linux/ecosystem/php/php7.3/Dockerfile | 2 + linux/ecosystem/php/php7.4/Dockerfile | 2 + linux/ecosystem/php/php8.0/Dockerfile | 2 + linux/ecosystem/php/php8.1/Dockerfile | 2 + linux/ecosystem/php/php8.2/Dockerfile | 2 + linux/ecosystem/php/php8.3/Dockerfile | 2 + 10 files changed, 44 insertions(+), 26 deletions(-) diff --git a/linux/ecosystem/apache2/php7.0/Dockerfile b/linux/ecosystem/apache2/php7.0/Dockerfile index 478fe4045..d395f9d6d 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 741e846b9..a54b98d9f 100644 --- a/linux/ecosystem/php/php7.0/Dockerfile +++ b/linux/ecosystem/php/php7.0/Dockerfile @@ -195,35 +195,37 @@ 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 +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_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 ./libssl1.1_1.1.1_amd64.deb && \ + 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 + 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 diff --git a/linux/ecosystem/php/php7.1/Dockerfile b/linux/ecosystem/php/php7.1/Dockerfile index a06db2a48..53ffeb1e9 100644 --- a/linux/ecosystem/php/php7.1/Dockerfile +++ b/linux/ecosystem/php/php7.1/Dockerfile @@ -196,6 +196,7 @@ RUN phpenmod \ # Cassandra CPP Support Install ############################################################################## COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_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 \ @@ -205,6 +206,7 @@ RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit 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 ./libssl1.1_1.1.1_amd64.deb && \ 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 && \ diff --git a/linux/ecosystem/php/php7.2/Dockerfile b/linux/ecosystem/php/php7.2/Dockerfile index ab3ec8775..5b81403c6 100644 --- a/linux/ecosystem/php/php7.2/Dockerfile +++ b/linux/ecosystem/php/php7.2/Dockerfile @@ -196,6 +196,7 @@ RUN phpenmod \ # Cassandra CPP Support Install ############################################################################## COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_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 \ @@ -205,6 +206,7 @@ RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit 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 ./libssl1.1_1.1.1_amd64.deb && \ 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 && \ diff --git a/linux/ecosystem/php/php7.3/Dockerfile b/linux/ecosystem/php/php7.3/Dockerfile index 076708ca6..b247ba76a 100644 --- a/linux/ecosystem/php/php7.3/Dockerfile +++ b/linux/ecosystem/php/php7.3/Dockerfile @@ -200,6 +200,7 @@ RUN phpenmod \ # Cassandra CPP Support Install ############################################################################## COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_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 \ @@ -209,6 +210,7 @@ RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit 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 ./libssl1.1_1.1.1_amd64.deb && \ 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 && \ diff --git a/linux/ecosystem/php/php7.4/Dockerfile b/linux/ecosystem/php/php7.4/Dockerfile index 1cf75b4ae..92e00ddba 100644 --- a/linux/ecosystem/php/php7.4/Dockerfile +++ b/linux/ecosystem/php/php7.4/Dockerfile @@ -205,6 +205,7 @@ RUN phpenmod \ # Cassandra CPP Support Install ############################################################################## COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_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 \ @@ -214,6 +215,7 @@ RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit 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 ./libssl1.1_1.1.1_amd64.deb && \ 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 && \ diff --git a/linux/ecosystem/php/php8.0/Dockerfile b/linux/ecosystem/php/php8.0/Dockerfile index afbb7cd3f..aaa1949e1 100644 --- a/linux/ecosystem/php/php8.0/Dockerfile +++ b/linux/ecosystem/php/php8.0/Dockerfile @@ -113,6 +113,7 @@ RUN phpenmod \ # Cassandra CPP Support Install ############################################################################## COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_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 \ @@ -122,6 +123,7 @@ RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit 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 ./libssl1.1_1.1.1_amd64.deb && \ 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 && \ diff --git a/linux/ecosystem/php/php8.1/Dockerfile b/linux/ecosystem/php/php8.1/Dockerfile index 720eacb39..fcaece7b2 100644 --- a/linux/ecosystem/php/php8.1/Dockerfile +++ b/linux/ecosystem/php/php8.1/Dockerfile @@ -113,6 +113,7 @@ RUN phpenmod \ # Cassandra CPP Support Install ############################################################################## COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_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 \ @@ -122,6 +123,7 @@ RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit 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 ./libssl1.1_1.1.1_amd64.deb && \ 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 && \ diff --git a/linux/ecosystem/php/php8.2/Dockerfile b/linux/ecosystem/php/php8.2/Dockerfile index bfb3dfa7a..3229e5a93 100644 --- a/linux/ecosystem/php/php8.2/Dockerfile +++ b/linux/ecosystem/php/php8.2/Dockerfile @@ -113,6 +113,7 @@ RUN phpenmod \ # Cassandra CPP Support Install ############################################################################## COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_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 \ @@ -122,6 +123,7 @@ RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit 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 ./libssl1.1_1.1.1_amd64.deb && \ 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 && \ diff --git a/linux/ecosystem/php/php8.3/Dockerfile b/linux/ecosystem/php/php8.3/Dockerfile index ddf4571ff..633896c0a 100644 --- a/linux/ecosystem/php/php8.3/Dockerfile +++ b/linux/ecosystem/php/php8.3/Dockerfile @@ -103,6 +103,7 @@ RUN phpenmod \ # Cassandra CPP Support Install ############################################################################## COPY addons/multiarch-support_2.28_amd64.deb /tmp/cassandra-php-driver/multiarch-support_2.28_amd64.deb +COPY addons/libssl1.1_1.1.1_amd64.deb /tmp/cassandra-php-driver/libssl1.1_1.1.1_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 \ @@ -112,6 +113,7 @@ RUN wget -c --random-wait --user-agent="Mozilla/5.0 (Windows NT 6.1) AppleWebKit 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 ./libssl1.1_1.1.1_amd64.deb && \ 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 && \