Browse Source

[php/imi] Update swoole v5.1.0 and use pdo_pgsql hook (#8456)

* Update swoole v5.1.0 and use pdo_pgsql hook

* Fix
Yurun 1 year ago
parent
commit
512114a3b9

+ 1 - 1
frameworks/PHP/imi/config/config.php

@@ -118,7 +118,7 @@ return (function() {
                     'username'    => env('DB_USERNAME', 'benchmarkdbuser'),
                     'username'    => env('DB_USERNAME', 'benchmarkdbuser'),
                     'password'    => env('DB_PASSWORD', 'benchmarkdbpass'),
                     'password'    => env('DB_PASSWORD', 'benchmarkdbpass'),
                     'database'    => 'hello_world',
                     'database'    => 'hello_world',
-                    'dbClass'     => \Imi\Pgsql\Db\Drivers\SwooleNew\Driver::class,
+                    'dbClass'     => \Imi\Pgsql\Db\Drivers\PdoPgsql\Driver::class,
                 ],
                 ],
             ],
             ],
         ] : [],
         ] : [],

+ 4 - 3
frameworks/PHP/imi/imi-swoole.dockerfile

@@ -1,14 +1,15 @@
 FROM php:8.2-cli
 FROM php:8.2-cli
 
 
-ENV SWOOLE_VERSION 5.0.1
+ENV SWOOLE_VERSION 5.1.0
 ARG TFB_TEST_DATABASE
 ARG TFB_TEST_DATABASE
 ENV TFB_TEST_DATABASE=${TFB_TEST_DATABASE}
 ENV TFB_TEST_DATABASE=${TFB_TEST_DATABASE}
 
 
-RUN docker-php-ext-install -j$(nproc) opcache mysqli
-
 RUN apt -yqq update && \
 RUN apt -yqq update && \
+    apt upgrade -y && \
     apt -yqq install git unzip libpq-dev
     apt -yqq install git unzip libpq-dev
 
 
+RUN docker-php-ext-install -j$(nproc) pdo_pgsql opcache mysqli
+
 RUN cd /tmp && curl -sSL "https://github.com/swoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz" | tar xzf - \
 RUN cd /tmp && curl -sSL "https://github.com/swoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz" | tar xzf - \
         && cd swoole-src-${SWOOLE_VERSION} \
         && cd swoole-src-${SWOOLE_VERSION} \
         && phpize && ./configure --enable-swoole-pgsql && make -j install \
         && phpize && ./configure --enable-swoole-pgsql && make -j install \