Skip to content

Commit b0293c0

Browse files
doubaokundoubaokun
authored
Merge pull request #33 from openswoole/22.0.0
v22.0.0
2 parents 2c9cdcf + d9901c4 commit b0293c0

File tree

23 files changed

+297
-25
lines changed

23 files changed

+297
-25
lines changed

‎.github/workflows/build_versioned_alpine_images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
workflow_dispatch:
55
push:
66
branches:
7-
- '[4-9].[0-9]+.[0-9]+'
8-
- '[4-9].[0-9]+.[0-9]+-?[a-zA-Z]**'
7+
- '[2-9]+.[0-9]+.[0-9]+'
8+
- '[2-9]+.[0-9]+.[0-9]+-?[a-zA-Z]**'
99

1010
jobs:
1111
build_versioned_alpine_images:

‎.github/workflows/build_versioned_dev_images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: Build Versioned Dev Images
33
on:
44
push:
55
branches:
6-
- '[4-9].[0-9]+.[0-9]+'
7-
- '[4-9].[0-9]+.[0-9]+-?[a-zA-Z]**'
6+
- '[2-9]+.[0-9]+.[0-9]+'
7+
- '[2-9]+.[0-9]+.[0-9]+-?[a-zA-Z]**'
88

99
jobs:
1010
build_versioned_dev_images:

‎.github/workflows/build_versioned_images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: Build Versioned Images
33
on:
44
push:
55
branches:
6-
- '[4-9].[0-9]+.[0-9]+'
7-
- '[4-9].[0-9]+.[0-9]+-?[a-zA-Z]**'
6+
- '[2-9]+.[0-9]+.[0-9]+'
7+
- '[2-9]+.[0-9]+.[0-9]+-?[a-zA-Z]**'
88

99
jobs:
1010
build_versioned_images:

‎Dockerfile.alpine.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN \
1717
--enable-http2 \
1818
--enable-mysqlnd \
1919
--enable-openssl \
20-
--enable-sockets {% if option_curl == true %}--enable-swoole-curl {% endif %}{% if option_json == true %}--enable-swoole-json {% endif %}{% if option_postgres == true %}--with-postgres {% endif %}&& \
20+
--enable-sockets {% if option_curl == true %}--enable-hook-curl {% endif %}{% if option_postgres == true %}--with-postgres {% endif %}&& \
2121
docker-php-ext-install -j$(nproc) --ini-name zzz-docker-php-ext-openswoole.ini openswoole && \
2222
rm -f swoole.tar.gz $HOME/.composer/*-old.phar && \
2323
docker-php-source delete && \

‎Dockerfile.cli.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN \
4747
--enable-http2 \
4848
--enable-mysqlnd \
4949
--enable-openssl \
50-
--enable-sockets {% if option_curl == true %}--enable-swoole-curl {% endif %}{% if option_json == true %}--enable-swoole-json {% endif %}{% if option_postgres == true %}--with-postgres {% endif %}&& \
50+
--enable-sockets {% if option_curl == true %}--enable-hook-curl {% endif %}{% if option_postgres == true %}--with-postgres {% endif %}&& \
5151
mkdir -p /var/log/supervisor && \
5252
rm -rf /var/lib/apt/lists/* $HOME/.composer/*-old.phar /usr/bin/qemu-*-static
5353

‎config/22.0.0.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# The YAML configuration file for generating Dockerfile of image openswoole/swoole:4.8.1.
2+
# For technical details of the configuration file, please check comments and sample configurations in file /config.yml.
3+
#
4+
status: "under development"
5+
php:
6+
- "7.4.32"
7+
- "8.0.24"
8+
- "8.1.11"
9+
- "8.2.0"
10+
image:
11+
composer:
12+
version: "2.1.6"

‎dockerfiles/22.0.0/php7.4/alpine/Dockerfile

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FROM php:7.4.32-cli-alpine3.16
2+
3+
RUN \
4+
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
5+
chmod +x /usr/bin/composer && \
6+
composer self-update --clean-backups 2.1.6 && \
7+
apk update && \
8+
apk add --no-cache linux-headers && \
9+
apk add --no-cache libstdc++ postgresql-dev libpq && \
10+
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
11+
docker-php-ext-install sockets && \
12+
docker-php-source extract && \
13+
mkdir /usr/src/php/ext/openswoole && \
14+
curl -sfL https://github.com/openswoole/swoole-src/archive/v22.0.0.tar.gz -o swoole.tar.gz && \
15+
tar xfz swoole.tar.gz --strip-components=1 -C /usr/src/php/ext/openswoole && \
16+
docker-php-ext-configure openswoole \
17+
--enable-http2 \
18+
--enable-mysqlnd \
19+
--enable-openssl \
20+
--enable-sockets --enable-hook-curl --with-postgres && \
21+
docker-php-ext-install -j$(nproc) --ini-name zzz-docker-php-ext-openswoole.ini openswoole && \
22+
rm -f swoole.tar.gz $HOME/.composer/*-old.phar && \
23+
docker-php-source delete && \
24+
apk del .build-deps
25+
26+
WORKDIR "/var/www/"

‎dockerfiles/22.0.0/php7.4/cli/Dockerfile

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
FROM php:7.4.32-cli
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
ENV TERM xterm-color
5+
6+
ARG DEV_MODE
7+
ENV DEV_MODE $DEV_MODE
8+
9+
ENV TINI_VERSION v0.19.0
10+
RUN dpkgArch="$(dpkg --print-architecture)" && curl -s -L -o /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${dpkgArch}
11+
RUN chmod +x /tini
12+
13+
COPY ./rootfilesystem/ /
14+
15+
RUN \
16+
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
17+
chmod +x /usr/bin/composer && \
18+
composer self-update 2.1.6 && \
19+
apt-get update && \
20+
apt-get install -y \
21+
libcurl4-openssl-dev \
22+
libpq-dev \
23+
libssl-dev \
24+
supervisor \
25+
unzip \
26+
zlib1g-dev \
27+
--no-install-recommends && \
28+
install-swoole.sh 22.0.0 \
29+
--enable-http2 \
30+
--enable-mysqlnd \
31+
--enable-openssl \
32+
--enable-sockets --enable-hook-curl --with-postgres && \
33+
mkdir -p /var/log/supervisor && \
34+
rm -rf /var/lib/apt/lists/* $HOME/.composer/*-old.phar /usr/bin/qemu-*-static
35+
36+
ENTRYPOINT ["/tini", "-g", "--", "/entrypoint.sh"]
37+
CMD []
38+
39+
WORKDIR "/var/www/"

‎dockerfiles/22.0.0/php8.0/alpine/Dockerfile

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FROM php:8.0.24-cli-alpine3.16
2+
3+
RUN \
4+
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
5+
chmod +x /usr/bin/composer && \
6+
composer self-update --clean-backups 2.1.6 && \
7+
apk update && \
8+
apk add --no-cache linux-headers && \
9+
apk add --no-cache libstdc++ postgresql-dev libpq && \
10+
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
11+
docker-php-ext-install sockets && \
12+
docker-php-source extract && \
13+
mkdir /usr/src/php/ext/openswoole && \
14+
curl -sfL https://github.com/openswoole/swoole-src/archive/v22.0.0.tar.gz -o swoole.tar.gz && \
15+
tar xfz swoole.tar.gz --strip-components=1 -C /usr/src/php/ext/openswoole && \
16+
docker-php-ext-configure openswoole \
17+
--enable-http2 \
18+
--enable-mysqlnd \
19+
--enable-openssl \
20+
--enable-sockets --enable-hook-curl --with-postgres && \
21+
docker-php-ext-install -j$(nproc) --ini-name zzz-docker-php-ext-openswoole.ini openswoole && \
22+
rm -f swoole.tar.gz $HOME/.composer/*-old.phar && \
23+
docker-php-source delete && \
24+
apk del .build-deps
25+
26+
WORKDIR "/var/www/"

‎dockerfiles/22.0.0/php8.0/cli/Dockerfile

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
FROM php:8.0.24-cli
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
ENV TERM xterm-color
5+
6+
ARG DEV_MODE
7+
ENV DEV_MODE $DEV_MODE
8+
9+
ENV TINI_VERSION v0.19.0
10+
RUN dpkgArch="$(dpkg --print-architecture)" && curl -s -L -o /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${dpkgArch}
11+
RUN chmod +x /tini
12+
13+
COPY ./rootfilesystem/ /
14+
15+
RUN \
16+
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
17+
chmod +x /usr/bin/composer && \
18+
composer self-update 2.1.6 && \
19+
apt-get update && \
20+
apt-get install -y \
21+
libcurl4-openssl-dev \
22+
libpq-dev \
23+
libssl-dev \
24+
supervisor \
25+
unzip \
26+
zlib1g-dev \
27+
--no-install-recommends && \
28+
install-swoole.sh 22.0.0 \
29+
--enable-http2 \
30+
--enable-mysqlnd \
31+
--enable-openssl \
32+
--enable-sockets --enable-hook-curl --with-postgres && \
33+
mkdir -p /var/log/supervisor && \
34+
rm -rf /var/lib/apt/lists/* $HOME/.composer/*-old.phar /usr/bin/qemu-*-static
35+
36+
ENTRYPOINT ["/tini", "-g", "--", "/entrypoint.sh"]
37+
CMD []
38+
39+
WORKDIR "/var/www/"

‎dockerfiles/22.0.0/php8.1/alpine/Dockerfile

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FROM php:8.1.11-cli-alpine3.16
2+
3+
RUN \
4+
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
5+
chmod +x /usr/bin/composer && \
6+
composer self-update --clean-backups 2.1.6 && \
7+
apk update && \
8+
apk add --no-cache linux-headers && \
9+
apk add --no-cache libstdc++ postgresql-dev libpq && \
10+
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
11+
docker-php-ext-install sockets && \
12+
docker-php-source extract && \
13+
mkdir /usr/src/php/ext/openswoole && \
14+
curl -sfL https://github.com/openswoole/swoole-src/archive/v22.0.0.tar.gz -o swoole.tar.gz && \
15+
tar xfz swoole.tar.gz --strip-components=1 -C /usr/src/php/ext/openswoole && \
16+
docker-php-ext-configure openswoole \
17+
--enable-http2 \
18+
--enable-mysqlnd \
19+
--enable-openssl \
20+
--enable-sockets --enable-hook-curl --with-postgres && \
21+
docker-php-ext-install -j$(nproc) --ini-name zzz-docker-php-ext-openswoole.ini openswoole && \
22+
rm -f swoole.tar.gz $HOME/.composer/*-old.phar && \
23+
docker-php-source delete && \
24+
apk del .build-deps
25+
26+
WORKDIR "/var/www/"

‎dockerfiles/22.0.0/php8.1/cli/Dockerfile

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
FROM php:8.1.11-cli
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
ENV TERM xterm-color
5+
6+
ARG DEV_MODE
7+
ENV DEV_MODE $DEV_MODE
8+
9+
ENV TINI_VERSION v0.19.0
10+
RUN dpkgArch="$(dpkg --print-architecture)" && curl -s -L -o /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${dpkgArch}
11+
RUN chmod +x /tini
12+
13+
COPY ./rootfilesystem/ /
14+
15+
RUN \
16+
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
17+
chmod +x /usr/bin/composer && \
18+
composer self-update 2.1.6 && \
19+
apt-get update && \
20+
apt-get install -y \
21+
libcurl4-openssl-dev \
22+
libpq-dev \
23+
libssl-dev \
24+
supervisor \
25+
unzip \
26+
zlib1g-dev \
27+
--no-install-recommends && \
28+
install-swoole.sh 22.0.0 \
29+
--enable-http2 \
30+
--enable-mysqlnd \
31+
--enable-openssl \
32+
--enable-sockets --enable-hook-curl --with-postgres && \
33+
mkdir -p /var/log/supervisor && \
34+
rm -rf /var/lib/apt/lists/* $HOME/.composer/*-old.phar /usr/bin/qemu-*-static
35+
36+
ENTRYPOINT ["/tini", "-g", "--", "/entrypoint.sh"]
37+
CMD []
38+
39+
WORKDIR "/var/www/"

‎dockerfiles/22.0.0/php8.2/alpine/Dockerfile

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FROM php:8.2.0-cli-alpine3.16
2+
3+
RUN \
4+
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
5+
chmod +x /usr/bin/composer && \
6+
composer self-update --clean-backups 2.1.6 && \
7+
apk update && \
8+
apk add --no-cache linux-headers && \
9+
apk add --no-cache libstdc++ postgresql-dev libpq && \
10+
apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \
11+
docker-php-ext-install sockets && \
12+
docker-php-source extract && \
13+
mkdir /usr/src/php/ext/openswoole && \
14+
curl -sfL https://github.com/openswoole/swoole-src/archive/v22.0.0.tar.gz -o swoole.tar.gz && \
15+
tar xfz swoole.tar.gz --strip-components=1 -C /usr/src/php/ext/openswoole && \
16+
docker-php-ext-configure openswoole \
17+
--enable-http2 \
18+
--enable-mysqlnd \
19+
--enable-openssl \
20+
--enable-sockets --enable-hook-curl --with-postgres && \
21+
docker-php-ext-install -j$(nproc) --ini-name zzz-docker-php-ext-openswoole.ini openswoole && \
22+
rm -f swoole.tar.gz $HOME/.composer/*-old.phar && \
23+
docker-php-source delete && \
24+
apk del .build-deps
25+
26+
WORKDIR "/var/www/"

‎dockerfiles/22.0.0/php8.2/cli/Dockerfile

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
FROM php:8.2.0-cli
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
ENV TERM xterm-color
5+
6+
ARG DEV_MODE
7+
ENV DEV_MODE $DEV_MODE
8+
9+
ENV TINI_VERSION v0.19.0
10+
RUN dpkgArch="$(dpkg --print-architecture)" && curl -s -L -o /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${dpkgArch}
11+
RUN chmod +x /tini
12+
13+
COPY ./rootfilesystem/ /
14+
15+
RUN \
16+
curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
17+
chmod +x /usr/bin/composer && \
18+
composer self-update 2.1.6 && \
19+
apt-get update && \
20+
apt-get install -y \
21+
libcurl4-openssl-dev \
22+
libpq-dev \
23+
libssl-dev \
24+
supervisor \
25+
unzip \
26+
zlib1g-dev \
27+
--no-install-recommends && \
28+
install-swoole.sh 22.0.0 \
29+
--enable-http2 \
30+
--enable-mysqlnd \
31+
--enable-openssl \
32+
--enable-sockets --enable-hook-curl --with-postgres && \
33+
mkdir -p /var/log/supervisor && \
34+
rm -rf /var/lib/apt/lists/* $HOME/.composer/*-old.phar /usr/bin/qemu-*-static
35+
36+
ENTRYPOINT ["/tini", "-g", "--", "/entrypoint.sh"]
37+
CMD []
38+
39+
WORKDIR "/var/www/"

‎dockerfiles/latest/php7.4/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ RUN \
1111
docker-php-ext-install sockets && \
1212
docker-php-source extract && \
1313
mkdir /usr/src/php/ext/openswoole && \
14-
curl -sfL https://github.com/openswoole/swoole-src/archive/v4.12.1.tar.gz -o swoole.tar.gz && \
14+
curl -sfL https://github.com/openswoole/swoole-src/archive/v22.0.0.tar.gz -o swoole.tar.gz && \
1515
tar xfz swoole.tar.gz --strip-components=1 -C /usr/src/php/ext/openswoole && \
1616
docker-php-ext-configure openswoole \
1717
--enable-http2 \
1818
--enable-mysqlnd \
1919
--enable-openssl \
20-
--enable-sockets --enable-swoole-curl --enable-swoole-json --with-postgres && \
20+
--enable-sockets --enable-hook-curl --with-postgres && \
2121
docker-php-ext-install -j$(nproc) --ini-name zzz-docker-php-ext-openswoole.ini openswoole && \
2222
rm -f swoole.tar.gz $HOME/.composer/*-old.phar && \
2323
docker-php-source delete && \

‎dockerfiles/latest/php7.4/cli/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ RUN \
2626
unzip \
2727
zlib1g-dev \
2828
--no-install-recommends && \
29-
install-swoole.sh v4.12.1 \
29+
install-swoole.sh v22.0.0 \
3030
--enable-http2 \
3131
--enable-mysqlnd \
3232
--enable-openssl \
33-
--enable-sockets --enable-swoole-curl --enable-swoole-json --with-postgres && \
33+
--enable-sockets --enable-hook-curl --with-postgres && \
3434
mkdir -p /var/log/supervisor && \
3535
rm -rf /var/lib/apt/lists/* $HOME/.composer/*-old.phar /usr/bin/qemu-*-static
3636

‎dockerfiles/latest/php8.0/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ RUN \
1111
docker-php-ext-install sockets && \
1212
docker-php-source extract && \
1313
mkdir /usr/src/php/ext/openswoole && \
14-
curl -sfL https://github.com/openswoole/swoole-src/archive/v4.12.1.tar.gz -o swoole.tar.gz && \
14+
curl -sfL https://github.com/openswoole/swoole-src/archive/v22.0.0.tar.gz -o swoole.tar.gz && \
1515
tar xfz swoole.tar.gz --strip-components=1 -C /usr/src/php/ext/openswoole && \
1616
docker-php-ext-configure openswoole \
1717
--enable-http2 \
1818
--enable-mysqlnd \
1919
--enable-openssl \
20-
--enable-sockets --enable-swoole-curl --enable-swoole-json --with-postgres && \
20+
--enable-sockets --enable-hook-curl --with-postgres && \
2121
docker-php-ext-install -j$(nproc) --ini-name zzz-docker-php-ext-openswoole.ini openswoole && \
2222
rm -f swoole.tar.gz $HOME/.composer/*-old.phar && \
2323
docker-php-source delete && \

‎dockerfiles/latest/php8.0/cli/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ RUN \
2626
unzip \
2727
zlib1g-dev \
2828
--no-install-recommends && \
29-
install-swoole.sh v4.12.1 \
29+
install-swoole.sh v22.0.0 \
3030
--enable-http2 \
3131
--enable-mysqlnd \
3232
--enable-openssl \
33-
--enable-sockets --enable-swoole-curl --enable-swoole-json --with-postgres && \
33+
--enable-sockets --enable-hook-curl --with-postgres && \
3434
mkdir -p /var/log/supervisor && \
3535
rm -rf /var/lib/apt/lists/* $HOME/.composer/*-old.phar /usr/bin/qemu-*-static
3636

0 commit comments

Comments
 (0)