Skip to content

Commit d211faa

Browse files
limingxinleolimingxinleo
committed
Support 8.4 for Swoole and Swow
1 parent e8bcd73 commit d211faa

File tree

7 files changed

+282
-24
lines changed

7 files changed

+282
-24
lines changed

‎.github/workflows/build-dev.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,19 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [ ubuntu-latest ]
17-
php-version: [ '8.1', '8.2', '8.3' ]
18-
alpine-version: [ '3.16', '3.17', '3.18', '3.19', '3.20', 'edge' ]
17+
php-version: [ '8.1', '8.2', '8.3', '8.4' ]
18+
alpine-version: [ '3.16', '3.17', '3.18', '3.19', '3.20', '3.21', 'edge' ]
1919
exclude:
20+
- php-version: '8.4'
21+
alpine-version: '3.16'
22+
- php-version: '8.4'
23+
alpine-version: '3.17'
24+
- php-version: '8.4'
25+
alpine-version: '3.18'
26+
- php-version: '8.4'
27+
alpine-version: '3.19'
28+
- php-version: '8.4'
29+
alpine-version: '3.20'
2030
- php-version: '8.3'
2131
alpine-version: '3.16'
2232
- php-version: '8.3'
@@ -29,6 +39,8 @@ jobs:
2939
alpine-version: '3.17'
3040
- php-version: '8.1'
3141
alpine-version: '3.20'
42+
- php-version: '8.1'
43+
alpine-version: '3.21'
3244
- php-version: '8.1'
3345
alpine-version: 'edge'
3446
max-parallel: 8
@@ -43,12 +55,7 @@ jobs:
4355
<?php
4456
$alpineVersion = getenv('ALPINE_VERSION');
4557
$phpVersion = getenv('PHP_VERSION');
46-
$version = match($phpVersion){
47-
'8.1' => '81',
48-
'8.2' => '82',
49-
'8.3' => '83',
50-
default => substr($phpVersion, 0, 1)
51-
};
58+
$version = str_replace(".", "", $phpVersion);
5259
echo "::set-output name=version::" . $version . PHP_EOL;
5360
- name: Set up QEMU
5461
uses: docker/setup-qemu-action@v3

‎.github/workflows/build-swoole.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,19 @@ jobs:
2020
matrix:
2121
os: [ ubuntu-latest ]
2222
spec: [ "", "-slim" ]
23-
php-version: [ '8.1', '8.2', '8.3' ]
24-
alpine-version: [ '3.16', '3.17', '3.18', '3.19', '3.20', 'edge' ]
23+
php-version: [ '8.1', '8.2', '8.3', '8.4' ]
24+
alpine-version: [ '3.16', '3.17', '3.18', '3.19', '3.20', '3.21', 'edge' ]
2525
exclude:
26+
- php-version: '8.4'
27+
alpine-version: '3.16'
28+
- php-version: '8.4'
29+
alpine-version: '3.17'
30+
- php-version: '8.4'
31+
alpine-version: '3.18'
32+
- php-version: '8.4'
33+
alpine-version: '3.19'
34+
- php-version: '8.4'
35+
alpine-version: '3.20'
2636
- php-version: '8.3'
2737
alpine-version: '3.16'
2838
- php-version: '8.3'
@@ -35,6 +45,8 @@ jobs:
3545
alpine-version: '3.17'
3646
- php-version: '8.1'
3747
alpine-version: '3.20'
48+
- php-version: '8.1'
49+
alpine-version: '3.21'
3850
- php-version: '8.1'
3951
alpine-version: 'edge'
4052
max-parallel: 16
@@ -49,12 +61,7 @@ jobs:
4961
<?php
5062
$alpineVersion = getenv('ALPINE_VERSION');
5163
$phpVersion = getenv('PHP_VERSION');
52-
$version = match($phpVersion){
53-
'8.1' => '81',
54-
'8.2' => '82',
55-
'8.3' => '83',
56-
default => substr($phpVersion, 0, 1)
57-
};
64+
$version = str_replace(".", "", $phpVersion);
5865
echo "::set-output name=version::" . $version . PHP_EOL;
5966
- name: Set up QEMU
6067
uses: docker/setup-qemu-action@v3

‎.github/workflows/build-swow.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,19 @@ jobs:
2020
matrix:
2121
os: [ ubuntu-latest ]
2222
spec: [ "" ]
23-
php-version: [ '8.1', '8.2', '8.3' ]
24-
alpine-version: [ '3.16', '3.17', '3.18', '3.19', '3.20', 'edge' ]
23+
php-version: [ '8.1', '8.2', '8.3', '8.4' ]
24+
alpine-version: [ '3.16', '3.17', '3.18', '3.19', '3.20', '3.21', 'edge' ]
2525
exclude:
26+
- php-version: '8.4'
27+
alpine-version: '3.16'
28+
- php-version: '8.4'
29+
alpine-version: '3.17'
30+
- php-version: '8.4'
31+
alpine-version: '3.18'
32+
- php-version: '8.4'
33+
alpine-version: '3.19'
34+
- php-version: '8.4'
35+
alpine-version: '3.20'
2636
- php-version: '8.3'
2737
alpine-version: '3.16'
2838
- php-version: '8.3'
@@ -35,6 +45,8 @@ jobs:
3545
alpine-version: '3.17'
3646
- php-version: '8.1'
3747
alpine-version: '3.20'
48+
- php-version: '8.1'
49+
alpine-version: '3.21'
3850
- php-version: '8.1'
3951
alpine-version: 'edge'
4052
max-parallel: 8
@@ -49,12 +61,7 @@ jobs:
4961
<?php
5062
$alpineVersion = getenv('ALPINE_VERSION');
5163
$phpVersion = getenv('PHP_VERSION');
52-
$version = match($phpVersion){
53-
'8.1' => '81',
54-
'8.2' => '82',
55-
'8.3' => '83',
56-
default => substr($phpVersion, 0, 1)
57-
};
64+
$version = str_replace(".", "", $phpVersion);
5865
echo "::set-output name=version::" . $version . PHP_EOL;
5966
- name: Set up QEMU
6067
uses: docker/setup-qemu-action@v3

‎8.4/alpine/dev/Dockerfile

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# hyperf/hyperf:8.4
2+
#
3+
# @link https://www.hyperf.io
4+
# @document https://hyperf.wiki
5+
# @contact group@hyperf.io
6+
# @license https://github.com/hyperf/hyperf/blob/master/LICENSE
7+
8+
ARG ALPINE_VERSION
9+
10+
FROM hyperf/hyperf:8.4-alpine-v${ALPINE_VERSION}-base
11+
12+
LABEL maintainer="Hyperf Developers <group@hyperf.io>" version="1.0" license="MIT"
13+
14+
ARG COMPOSER_VERSION
15+
ARG PHP_BUILD_VERSION
16+
17+
ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \
18+
COMPOSER_ALLOW_SUPERUSER=1
19+
20+
##
21+
# ---------- env settings ----------
22+
##
23+
ENV 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"
24+
25+
# update
26+
RUN set -ex \
27+
&& apk update \
28+
&& apk add --no-cache libstdc++ openssl git bash \
29+
&& apk add --no-cache $PHPIZE_DEPS libaio-dev openssl-dev curl-dev \
30+
&& ln -s /usr/bin/phpize${PHP_BUILD_VERSION} /usr/local/bin/phpize \
31+
&& ln -s /usr/bin/php-config${PHP_BUILD_VERSION} /usr/local/bin/php-config \
32+
&& ln -s /usr/bin/pecl${PHP_BUILD_VERSION} /usr/local/bin/pecl \
33+
# install composer
34+
&& wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
35+
&& chmod u+x /usr/local/bin/composer \
36+
# php info
37+
&& php -v \
38+
&& php -m \
39+
# ---------- clear works ----------
40+
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man \
41+
&& echo -e "\033[42;37m Build Completed :).\033[0m\n"

‎8.4/alpine/swoole/Dockerfile

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# hyperf/hyperf:8.4
2+
#
3+
# @link https://www.hyperf.io
4+
# @document https://hyperf.wiki
5+
# @contact group@hyperf.io
6+
# @license https://github.com/hyperf/hyperf/blob/master/LICENSE
7+
8+
ARG ALPINE_VERSION
9+
10+
FROM hyperf/hyperf:8.4-alpine-v${ALPINE_VERSION}-base
11+
12+
LABEL maintainer="Hyperf Developers <group@hyperf.io>" 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 c-ares-dev libpq-dev php84-pdo_pgsql php84-pdo_sqlite php84-pdo_odbc \
32+
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS unixodbc-dev sqlite-dev \
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 --enable-cares --enable-swoole-pgsql --enable-swoole-sqlite --with-swoole-odbc=unixodbc,/usr \
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 "max_input_vars=PHP_INT_MAX" >> /etc/php${PHP_BUILD_VERSION}/conf.d/00_default.ini \
51+
&& echo "opcache.enable_cli = 'On'" >> /etc/php${PHP_BUILD_VERSION}/conf.d/00_opcache.ini \
52+
&& echo "extension=swoole.so" > /etc/php${PHP_BUILD_VERSION}/conf.d/50_swoole.ini \
53+
&& echo "swoole.use_shortname = 'Off'" >> /etc/php${PHP_BUILD_VERSION}/conf.d/50_swoole.ini \
54+
# install composer
55+
&& wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
56+
&& chmod u+x /usr/local/bin/composer \
57+
# ---------- clear works ----------
58+
&& apk del .build-deps \
59+
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/local/bin/php* \
60+
# php info
61+
&& php -v \
62+
&& php -m \
63+
&& php --ri swoole \
64+
&& php --ri Zend\ OPcache \
65+
&& composer \
66+
&& echo -e "\033[42;37m Build Completed :).\033[0m\n"

‎8.4/alpine/swoole/Dockerfile-slim

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# hyperf/hyperf:8.4
2+
#
3+
# @link https://www.hyperf.io
4+
# @document https://hyperf.wiki
5+
# @contact group@hyperf.io
6+
# @license https://github.com/hyperf/hyperf/blob/master/LICENSE
7+
8+
ARG ALPINE_VERSION
9+
10+
FROM hyperf/hyperf:8.4-alpine-v${ALPINE_VERSION}-base
11+
12+
LABEL maintainer="Hyperf Developers <group@hyperf.io>" 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 "max_input_vars=PHP_INT_MAX" >> /etc/php${PHP_BUILD_VERSION}/conf.d/00_default.ini \
51+
&& echo "opcache.enable_cli = 'On'" >> /etc/php${PHP_BUILD_VERSION}/conf.d/00_opcache.ini \
52+
&& echo "extension=swoole.so" > /etc/php${PHP_BUILD_VERSION}/conf.d/50_swoole.ini \
53+
&& echo "swoole.use_shortname = 'Off'" >> /etc/php${PHP_BUILD_VERSION}/conf.d/50_swoole.ini \
54+
# install composer
55+
&& wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
56+
&& chmod u+x /usr/local/bin/composer \
57+
# ---------- clear works ----------
58+
&& apk del .build-deps \
59+
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/local/bin/php* \
60+
# php info
61+
&& php -v \
62+
&& php -m \
63+
&& php --ri swoole \
64+
&& php --ri Zend\ OPcache \
65+
&& composer \
66+
&& echo -e "\033[42;37m Build Completed :).\033[0m\n"

‎8.4/alpine/swow/Dockerfile

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# hyperf/hyperf:8.4
2+
#
3+
# @link https://www.hyperf.io
4+
# @document https://hyperf.wiki
5+
# @contact group@hyperf.io
6+
# @license https://github.com/hyperf/hyperf/blob/master/LICENSE
7+
8+
ARG ALPINE_VERSION
9+
10+
FROM hyperf/hyperf:8.4-alpine-v${ALPINE_VERSION}-base
11+
12+
LABEL maintainer="Hyperf Developers <group@hyperf.io>" 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:-"develop"} \
22+
COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \
23+
COMPOSER_ALLOW_SUPERUSER=1 \
24+
# install and remove building packages
25+
PHPIZE_DEPS="autoconf automake gcc g++ make php${PHP_BUILD_VERSION}-dev php${PHP_BUILD_VERSION}-pear file re2c openssl-dev curl-dev"
26+
27+
# update
28+
RUN set -ex \
29+
&& apk update \
30+
# for swow extension libaio linux-headers
31+
&& apk add --no-cache openssl git bash \
32+
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
33+
# download
34+
&& cd /tmp \
35+
&& curl -SL "https://github.com/swow/swow/archive/${SW_VERSION}.tar.gz" -o swow.tar.gz \
36+
&& ls -alh \
37+
# php extension:swow
38+
&& cd /tmp \
39+
&& mkdir -p swow \
40+
&& tar -xf swow.tar.gz -C swow --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 swow/ext \
45+
&& phpize \
46+
&& ./configure --enable-swow --enable-swow-ssl --enable-swow-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 "max_input_vars=PHP_INT_MAX" >> /etc/php${PHP_BUILD_VERSION}/conf.d/00_default.ini \
51+
&& echo "opcache.enable_cli = 'On'" >> /etc/php${PHP_BUILD_VERSION}/conf.d/00_opcache.ini \
52+
&& echo "extension=swow.so" > /etc/php${PHP_BUILD_VERSION}/conf.d/50_swow.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+
# php info
57+
&& php -v \
58+
&& php -m \
59+
&& php --ri swow \
60+
&& composer \
61+
# ---------- clear works ----------
62+
&& apk del .build-deps \
63+
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/local/bin/php* \
64+
&& echo -e "\033[42;37m Build Completed :).\033[0m\n"

0 commit comments

Comments
 (0)