Skip to content

Commit 87ce79c

Browse files
committed
Support coroutine for pdo_sqlite and pdo_odbc
1 parent 0941cab commit 87ce79c

File tree

6 files changed

+204
-9
lines changed

6 files changed

+204
-9
lines changed

8.1/alpine/swoole/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \
2828
RUN set -ex \
2929
&& apk update \
3030
# for swoole extension libaio linux-headers
31-
&& apk add --no-cache libstdc++ openssl git bash c-ares-dev libpq-dev \
32-
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
31+
&& apk add --no-cache libstdc++ openssl git bash c-ares-dev libpq-dev php81-pdo_sqlite php81-pdo_odbc \
32+
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS unixodbc-dev sqlite-dev \
3333
# download
3434
&& cd /tmp \
3535
&& curl -SL "https://github.com/swoole/swoole-src/archive/${SW_VERSION}.tar.gz" -o swoole.tar.gz \
@@ -43,7 +43,7 @@ RUN set -ex \
4343
&& ( \
4444
cd swoole \
4545
&& phpize \
46-
&& ./configure --enable-openssl --enable-swoole-curl --enable-cares --enable-swoole-pgsql \
46+
&& ./configure --enable-openssl --enable-swoole-curl --enable-cares --enable-swoole-pgsql --enable-swoole-sqlite --with-swoole-odbc=unixodbc,/usr \
4747
&& make -s -j$(nproc) && make install \
4848
) \
4949
&& echo "memory_limit=1G" > /etc/php${PHP_BUILD_VERSION}/conf.d/00_default.ini \

8.1/alpine/swoole/slim.Dockerfile

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# hyperf/hyperf:8.1
2+
#
3+
# @link https://www.hyperf.io
4+
# @document https://hyperf.wiki
5+
6+
# @license https://github.com/hyperf/hyperf/blob/master/LICENSE
7+
8+
ARG ALPINE_VERSION
9+
10+
FROM hyperf/hyperf:8.1-alpine-v${ALPINE_VERSION}-base
11+
12+
LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT"
13+
14+
ARG SW_VERSION
15+
ARG COMPOSER_VERSION
16+
ARG PHP_BUILD_VERSION
17+
18+
##
19+
# ---------- env settings ----------
20+
##
21+
ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \
22+
COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \
23+
COMPOSER_ALLOW_SUPERUSER=1 \
24+
# install and remove building packages
25+
PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make php${PHP_BUILD_VERSION}-dev php${PHP_BUILD_VERSION}-pear pkgconf re2c pcre-dev pcre2-dev zlib-dev libtool automake libaio-dev openssl-dev curl-dev"
26+
27+
# update
28+
RUN set -ex \
29+
&& apk update \
30+
# for swoole extension libaio linux-headers
31+
&& apk add --no-cache libstdc++ openssl git bash \
32+
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
33+
# download
34+
&& cd /tmp \
35+
&& curl -SL "https://github.com/swoole/swoole-src/archive/${SW_VERSION}.tar.gz" -o swoole.tar.gz \
36+
&& ls -alh \
37+
# php extension:swoole
38+
&& cd /tmp \
39+
&& mkdir -p swoole \
40+
&& tar -xf swoole.tar.gz -C swoole --strip-components=1 \
41+
&& ln -s /usr/bin/phpize${PHP_BUILD_VERSION} /usr/local/bin/phpize \
42+
&& ln -s /usr/bin/php-config${PHP_BUILD_VERSION} /usr/local/bin/php-config \
43+
&& ( \
44+
cd swoole \
45+
&& phpize \
46+
&& ./configure --enable-openssl --enable-swoole-curl \
47+
&& make -s -j$(nproc) && make install \
48+
) \
49+
&& echo "memory_limit=1G" > /etc/php${PHP_BUILD_VERSION}/conf.d/00_default.ini \
50+
&& echo "opcache.enable_cli = 'On'" >> /etc/php${PHP_BUILD_VERSION}/conf.d/00_opcache.ini \
51+
&& echo "extension=swoole.so" > /etc/php${PHP_BUILD_VERSION}/conf.d/50_swoole.ini \
52+
&& echo "swoole.use_shortname = 'Off'" >> /etc/php${PHP_BUILD_VERSION}/conf.d/50_swoole.ini \
53+
# install composer
54+
&& wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
55+
&& chmod u+x /usr/local/bin/composer \
56+
# ---------- clear works ----------
57+
&& apk del .build-deps \
58+
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/local/bin/php* \
59+
# php info
60+
&& php -v \
61+
&& php -m \
62+
&& php --ri swoole \
63+
&& php --ri Zend\ OPcache \
64+
&& composer \
65+
&& echo -e "\033[42;37m Build Completed :).\033[0m\n"

8.2/alpine/swoole/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \
2828
RUN set -ex \
2929
&& apk update \
3030
# for swoole extension libaio linux-headers
31-
&& apk add --no-cache libstdc++ openssl git bash c-ares-dev libpq-dev \
32-
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
31+
&& apk add --no-cache libstdc++ openssl git bash c-ares-dev libpq-dev php82-pdo_sqlite php82-pdo_odbc \
32+
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS unixodbc-dev sqlite-dev \
3333
# download
3434
&& cd /tmp \
3535
&& curl -SL "https://github.com/swoole/swoole-src/archive/${SW_VERSION}.tar.gz" -o swoole.tar.gz \
@@ -43,7 +43,7 @@ RUN set -ex \
4343
&& ( \
4444
cd swoole \
4545
&& phpize \
46-
&& ./configure --enable-openssl --enable-swoole-curl --enable-cares --enable-swoole-pgsql \
46+
&& ./configure --enable-openssl --enable-swoole-curl --enable-cares --enable-swoole-pgsql --enable-swoole-sqlite --with-swoole-odbc=unixodbc,/usr \
4747
&& make -s -j$(nproc) && make install \
4848
) \
4949
&& echo "memory_limit=1G" > /etc/php${PHP_BUILD_VERSION}/conf.d/00_default.ini \

8.2/alpine/swoole/slim.Dockerfile

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# hyperf/hyperf:8.2
2+
#
3+
# @link https://www.hyperf.io
4+
# @document https://hyperf.wiki
5+
6+
# @license https://github.com/hyperf/hyperf/blob/master/LICENSE
7+
8+
ARG ALPINE_VERSION
9+
10+
FROM hyperf/hyperf:8.2-alpine-v${ALPINE_VERSION}-base
11+
12+
LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT"
13+
14+
ARG SW_VERSION
15+
ARG COMPOSER_VERSION
16+
ARG PHP_BUILD_VERSION
17+
18+
##
19+
# ---------- env settings ----------
20+
##
21+
ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \
22+
COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \
23+
COMPOSER_ALLOW_SUPERUSER=1 \
24+
# install and remove building packages
25+
PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make php${PHP_BUILD_VERSION}-dev php${PHP_BUILD_VERSION}-pear pkgconf re2c pcre-dev pcre2-dev zlib-dev libtool automake libaio-dev openssl-dev curl-dev"
26+
27+
# update
28+
RUN set -ex \
29+
&& apk update \
30+
# for swoole extension libaio linux-headers
31+
&& apk add --no-cache libstdc++ openssl git bash \
32+
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
33+
# download
34+
&& cd /tmp \
35+
&& curl -SL "https://github.com/swoole/swoole-src/archive/${SW_VERSION}.tar.gz" -o swoole.tar.gz \
36+
&& ls -alh \
37+
# php extension:swoole
38+
&& cd /tmp \
39+
&& mkdir -p swoole \
40+
&& tar -xf swoole.tar.gz -C swoole --strip-components=1 \
41+
&& ln -s /usr/bin/phpize${PHP_BUILD_VERSION} /usr/local/bin/phpize \
42+
&& ln -s /usr/bin/php-config${PHP_BUILD_VERSION} /usr/local/bin/php-config \
43+
&& ( \
44+
cd swoole \
45+
&& phpize \
46+
&& ./configure --enable-openssl --enable-swoole-curl \
47+
&& make -s -j$(nproc) && make install \
48+
) \
49+
&& echo "memory_limit=1G" > /etc/php${PHP_BUILD_VERSION}/conf.d/00_default.ini \
50+
&& echo "opcache.enable_cli = 'On'" >> /etc/php${PHP_BUILD_VERSION}/conf.d/00_opcache.ini \
51+
&& echo "extension=swoole.so" > /etc/php${PHP_BUILD_VERSION}/conf.d/50_swoole.ini \
52+
&& echo "swoole.use_shortname = 'Off'" >> /etc/php${PHP_BUILD_VERSION}/conf.d/50_swoole.ini \
53+
# install composer
54+
&& wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
55+
&& chmod u+x /usr/local/bin/composer \
56+
# ---------- clear works ----------
57+
&& apk del .build-deps \
58+
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/local/bin/php* \
59+
# php info
60+
&& php -v \
61+
&& php -m \
62+
&& php --ri swoole \
63+
&& php --ri Zend\ OPcache \
64+
&& composer \
65+
&& echo -e "\033[42;37m Build Completed :).\033[0m\n"

8.3/alpine/swoole/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \
2828
RUN set -ex \
2929
&& apk update \
3030
# for swoole extension libaio linux-headers
31-
&& apk add --no-cache libstdc++ openssl git bash c-ares-dev libpq-dev \
32-
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
31+
&& apk add --no-cache libstdc++ openssl git bash c-ares-dev libpq-dev php83-pdo_sqlite php83-pdo_odbc \
32+
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS unixodbc-dev sqlite-dev \
3333
# download
3434
&& cd /tmp \
3535
&& curl -SL "https://github.com/swoole/swoole-src/archive/${SW_VERSION}.tar.gz" -o swoole.tar.gz \
@@ -43,7 +43,7 @@ RUN set -ex \
4343
&& ( \
4444
cd swoole \
4545
&& phpize \
46-
&& ./configure --enable-openssl --enable-swoole-curl --enable-cares --enable-swoole-pgsql \
46+
&& ./configure --enable-openssl --enable-swoole-curl --enable-cares --enable-swoole-pgsql --enable-swoole-sqlite --with-swoole-odbc=unixodbc,/usr \
4747
&& make -s -j$(nproc) && make install \
4848
) \
4949
&& echo "memory_limit=1G" > /etc/php${PHP_BUILD_VERSION}/conf.d/00_default.ini \

8.3/alpine/swoole/slim.Dockerfile

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# hyperf/hyperf:8.3
2+
#
3+
# @link https://www.hyperf.io
4+
# @document https://hyperf.wiki
5+
6+
# @license https://github.com/hyperf/hyperf/blob/master/LICENSE
7+
8+
ARG ALPINE_VERSION
9+
10+
FROM hyperf/hyperf:8.3-alpine-v${ALPINE_VERSION}-base
11+
12+
LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT"
13+
14+
ARG SW_VERSION
15+
ARG COMPOSER_VERSION
16+
ARG PHP_BUILD_VERSION
17+
18+
##
19+
# ---------- env settings ----------
20+
##
21+
ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \
22+
COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \
23+
COMPOSER_ALLOW_SUPERUSER=1 \
24+
# install and remove building packages
25+
PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make php${PHP_BUILD_VERSION}-dev php${PHP_BUILD_VERSION}-pear pkgconf re2c pcre-dev pcre2-dev zlib-dev libtool automake libaio-dev openssl-dev curl-dev"
26+
27+
# update
28+
RUN set -ex \
29+
&& apk update \
30+
# for swoole extension libaio linux-headers
31+
&& apk add --no-cache libstdc++ openssl git bash \
32+
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
33+
# download
34+
&& cd /tmp \
35+
&& curl -SL "https://github.com/swoole/swoole-src/archive/${SW_VERSION}.tar.gz" -o swoole.tar.gz \
36+
&& ls -alh \
37+
# php extension:swoole
38+
&& cd /tmp \
39+
&& mkdir -p swoole \
40+
&& tar -xf swoole.tar.gz -C swoole --strip-components=1 \
41+
&& ln -s /usr/bin/phpize${PHP_BUILD_VERSION} /usr/local/bin/phpize \
42+
&& ln -s /usr/bin/php-config${PHP_BUILD_VERSION} /usr/local/bin/php-config \
43+
&& ( \
44+
cd swoole \
45+
&& phpize \
46+
&& ./configure --enable-openssl --enable-swoole-curl \
47+
&& make -s -j$(nproc) && make install \
48+
) \
49+
&& echo "memory_limit=1G" > /etc/php${PHP_BUILD_VERSION}/conf.d/00_default.ini \
50+
&& echo "opcache.enable_cli = 'On'" >> /etc/php${PHP_BUILD_VERSION}/conf.d/00_opcache.ini \
51+
&& echo "extension=swoole.so" > /etc/php${PHP_BUILD_VERSION}/conf.d/50_swoole.ini \
52+
&& echo "swoole.use_shortname = 'Off'" >> /etc/php${PHP_BUILD_VERSION}/conf.d/50_swoole.ini \
53+
# install composer
54+
&& wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
55+
&& chmod u+x /usr/local/bin/composer \
56+
# ---------- clear works ----------
57+
&& apk del .build-deps \
58+
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/local/bin/php* \
59+
# php info
60+
&& php -v \
61+
&& php -m \
62+
&& php --ri swoole \
63+
&& php --ri Zend\ OPcache \
64+
&& composer \
65+
&& echo -e "\033[42;37m Build Completed :).\033[0m\n"

0 commit comments

Comments
 (0)