From ee80578fc6267d53cdcf27c7ccccce94222cb6fb Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 7 Oct 2021 22:49:24 +0800 Subject: [PATCH 1/4] php7.0 mongodb fixed version number --- php-fpm/Dockerfile | 16 +++++++++++----- workspace/Dockerfile | 24 +++++++++++++++--------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 46503669..44b296d2 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -358,12 +358,18 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ # Install the mongodb extension if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ pecl install mongo && \ - docker-php-ext-enable mongo \ - ;else \ - pecl install mongodb && \ + docker-php-ext-enable mongo; \ + php -m | grep -oiE '^mongo$'; \ + else \ + if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + pecl install mongodb-1.9.2; \ + else \ + pecl install mongodb; \ + fi; \ docker-php-ext-enable mongodb \ - ;fi \ -;fi + php -m | grep -oiE '^mongodb$'; \ + fi; \ +fi ########################################################################### # Xhprof: diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 1d525c41..092e7115 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -452,15 +452,21 @@ ARG INSTALL_MONGO=false RUN if [ ${INSTALL_MONGO} = true ]; then \ # Install the mongodb extension if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - pecl install mongo && \ - echo "extension=mongo.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini && \ - ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongo.ini \ - ;else \ - pecl install mongodb && \ - echo "extension=mongodb.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongodb.ini && \ - ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongodb.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongodb.ini \ - ;fi \ -;fi + pecl install mongo; \ + echo "extension=mongo.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini; \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongo.ini; \ + php -m | grep -oiE '^mongo$'; \ + else \ + if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + pecl install mongodb-1.9.2; \ + else \ + pecl install mongodb; \ + fi; \ + echo "extension=mongodb.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongodb.ini; \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongodb.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongodb.ini; \ + php -m | grep -oiE '^mongodb$'; \ + fi; \ +fi ########################################################################### # AMQP: From 4439c16acd22586b7700477dffead81ada7161d0 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 7 Oct 2021 22:58:28 +0800 Subject: [PATCH 2/4] CI: skip install PG_CLIENT --- .github/workflows/main-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 97a324cb..6721cc70 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -44,6 +44,7 @@ jobs: sed -i -- 's/AUDIOWAVEFORM=true/AUDIOWAVEFORM=false/g' .env sed -i -- 's/SSDB=true/SSDB=false/g' .env sed -i -- 's/ENCHANT=true/ENCHANT=false/g' .env + sed -i -- 's/PG_CLIENT=true/PG_CLIENT=false/g' .env docker-compose build ${{ matrix.service }} docker-compose up -d --no-deps -- ${{ matrix.service }} docker-compose exec -T -- ${{ matrix.service }} php -m From 67b7d186071b83761e010c60fda0c1de0d70285e Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 7 Oct 2021 23:32:57 +0800 Subject: [PATCH 3/4] fix typo --- php-fpm/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 44b296d2..1f99e726 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -357,7 +357,7 @@ ARG INSTALL_MONGO=false RUN if [ ${INSTALL_MONGO} = true ]; then \ # Install the mongodb extension if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - pecl install mongo && \ + pecl install mongo; \ docker-php-ext-enable mongo; \ php -m | grep -oiE '^mongo$'; \ else \ @@ -366,7 +366,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ else \ pecl install mongodb; \ fi; \ - docker-php-ext-enable mongodb \ + docker-php-ext-enable mongodb; \ php -m | grep -oiE '^mongodb$'; \ fi; \ fi From 50300f5bb14591866afbd0cad84722e9c2c4d22c Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 7 Oct 2021 23:39:34 +0800 Subject: [PATCH 4/4] php-worker mongodb --- php-worker/Dockerfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 8dabe290..0f6335d7 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -141,13 +141,19 @@ RUN if [ ${INSTALL_SOAP} = true ]; then \ # Install MongoDB drivers: ARG INSTALL_MONGO=false RUN if [ ${INSTALL_MONGO} = true ]; then \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - pecl install mongo; \ - docker-php-ext-enable mongo; \ - else \ - pecl install mongodb; \ - docker-php-ext-enable mongodb; \ - fi; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + pecl install mongo; \ + docker-php-ext-enable mongo; \ + php -m | grep -oiE '^mongo$'; \ + else \ + if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + pecl install mongodb-1.9.2; \ + else \ + pecl install mongodb; \ + fi; \ + docker-php-ext-enable mongodb; \ + php -m | grep -oiE '^mongodb$'; \ + fi; \ fi ###########################################################################