diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index de0d6a2..0848c69 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -2,7 +2,7 @@ name: Build Develop on: [ push ] env: - COMPOSER_VERSION: '2.6.5' + COMPOSER_VERSION: '2.6.6' GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: build: diff --git a/.github/workflows/build-swoole.yml b/.github/workflows/build-swoole.yml index 44fc169..1f11252 100644 --- a/.github/workflows/build-swoole.yml +++ b/.github/workflows/build-swoole.yml @@ -4,7 +4,7 @@ on: [ push ] env: ENGINE: 'swoole' SW_VERSION: 'v5.1.1' - COMPOSER_VERSION: '2.6.5' + COMPOSER_VERSION: '2.6.6' GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_ACCESSTOKEN }} jobs: diff --git a/.github/workflows/build-swow.yml b/.github/workflows/build-swow.yml index f6699c8..3226900 100644 --- a/.github/workflows/build-swow.yml +++ b/.github/workflows/build-swow.yml @@ -3,8 +3,8 @@ name: Build Swow on: [ push ] env: ENGINE: 'swow' - SW_VERSION: 'v1.3.1' - COMPOSER_VERSION: '2.6.5' + SW_VERSION: 'v1.4.1' + COMPOSER_VERSION: '2.6.6' GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_ACCESSTOKEN }} jobs: diff --git a/8.0/alpine/base/Dockerfile b/8.0/alpine/base/Dockerfile deleted file mode 100644 index daa00dc..0000000 --- a/8.0/alpine/base/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -# hyperf/hyperf:8.0 -# -# @link https://www.hyperf.io -# @document https://hyperf.wiki -# @contact group@hyperf.io -# @license https://github.com/hyperf/hyperf/blob/master/LICENSE - -ARG ALPINE_VERSION - -FROM alpine:$ALPINE_VERSION - -LABEL maintainer="Hyperf Developers " version="1.0" license="MIT" - -## -# ---------- building ---------- -## -RUN set -ex \ - && apk update \ - && apk add --no-cache \ - # Install base packages ('ca-certificates' will install 'nghttp2-libs') - ca-certificates \ - curl \ - wget \ - tar \ - xz \ - tzdata \ - pcre \ - php8 \ - php8-bcmath \ - php8-curl \ - php8-ctype \ - php8-dom \ - php8-fileinfo \ - php8-gd \ - php8-iconv \ - php8-mbstring \ - php8-mysqlnd \ - php8-openssl \ - php8-pdo \ - php8-pdo_mysql \ - php8-pdo_sqlite \ - php8-phar \ - php8-posix \ - php8-redis \ - php8-sockets \ - php8-sodium \ - php8-sysvshm \ - php8-sysvmsg \ - php8-sysvsem \ - php8-simplexml \ - php8-tokenizer \ - php8-zip \ - php8-zlib \ - php8-xml \ - php8-xmlreader \ - php8-xmlwriter \ - php8-pcntl \ - php8-opcache \ - && ln -sf /usr/bin/php8 /usr/bin/php \ - && apk del --purge *-dev \ - && rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/share/php8 \ - && php -v \ - && php -m \ - && echo -e "\033[42;37m Build Completed :).\033[0m\n" diff --git a/8.0/alpine/dev/Dockerfile b/8.0/alpine/dev/Dockerfile deleted file mode 100644 index 9c429c0..0000000 --- a/8.0/alpine/dev/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -# hyperf/hyperf:8.0 -# -# @link https://www.hyperf.io -# @document https://hyperf.wiki -# @contact group@hyperf.io -# @license https://github.com/hyperf/hyperf/blob/master/LICENSE - -ARG ALPINE_VERSION - -FROM hyperf/hyperf:8.0-alpine-v${ALPINE_VERSION}-base - -LABEL maintainer="Hyperf Developers " version="1.0" license="MIT" - -ARG COMPOSER_VERSION - -ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \ - COMPOSER_ALLOW_SUPERUSER=1 - -## -# ---------- env settings ---------- -## -ENV PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make php8-dev php8-pear pkgconf re2c pcre-dev pcre2-dev zlib-dev libtool automake" - -# update -RUN set -ex \ - && apk update \ - && apk add --no-cache libstdc++ openssl git bash \ - && apk add --no-cache $PHPIZE_DEPS libaio-dev openssl-dev curl-dev \ - && ln -s /usr/bin/phpize8 /usr/local/bin/phpize \ - && ln -s /usr/bin/php-config8 /usr/local/bin/php-config \ - && ln -s /usr/bin/pecl8 /usr/local/bin/pecl \ - # install composer - && wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \ - && chmod u+x /usr/local/bin/composer \ - # php info - && php -v \ - && php -m \ - # ---------- clear works ---------- - && rm -rf /var/cache/apk/* /tmp/* /usr/share/man \ - && echo -e "\033[42;37m Build Completed :).\033[0m\n" diff --git a/8.0/alpine/swoole/Dockerfile b/8.0/alpine/swoole/Dockerfile deleted file mode 100644 index f23fca3..0000000 --- a/8.0/alpine/swoole/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -# hyperf/hyperf:8.0 -# -# @link https://www.hyperf.io -# @document https://hyperf.wiki -# @contact group@hyperf.io -# @license https://github.com/hyperf/hyperf/blob/master/LICENSE - -ARG ALPINE_VERSION - -FROM hyperf/hyperf:8.0-alpine-v${ALPINE_VERSION}-base - -LABEL maintainer="Hyperf Developers " version="1.0" license="MIT" - -ARG SW_VERSION -ARG COMPOSER_VERSION - -## -# ---------- env settings ---------- -## -ENV SW_VERSION=${SW_VERSION:-"v4.6.7"} \ - COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \ - COMPOSER_ALLOW_SUPERUSER=1 \ - # install and remove building packages - PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make php8-dev php8-pear pkgconf re2c pcre-dev pcre2-dev zlib-dev libtool automake" - -# update -RUN set -ex \ - && apk update \ - # for swoole extension libaio linux-headers - && apk add --no-cache libstdc++ openssl git bash \ - && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS libaio-dev openssl-dev curl-dev \ - # download - && cd /tmp \ - && curl -SL "https://github.com/swoole/swoole-src/archive/${SW_VERSION}.tar.gz" -o swoole.tar.gz \ - && ls -alh \ - # php extension:swoole - && cd /tmp \ - && mkdir -p swoole \ - && tar -xf swoole.tar.gz -C swoole --strip-components=1 \ - && ln -s /usr/bin/phpize8 /usr/local/bin/phpize \ - && ln -s /usr/bin/php-config8 /usr/local/bin/php-config \ - && ( \ - cd swoole \ - && phpize \ - && ./configure --enable-openssl --enable-http2 --enable-swoole-curl --enable-swoole-json \ - && make -s -j$(nproc) && make install \ - ) \ - && echo "memory_limit=1G" > /etc/php8/conf.d/00_default.ini \ - && echo "opcache.enable_cli = 'On'" >> /etc/php8/conf.d/00_opcache.ini \ - && echo "extension=swoole.so" > /etc/php8/conf.d/50_swoole.ini \ - && echo "swoole.use_shortname = 'Off'" >> /etc/php8/conf.d/50_swoole.ini \ - # install composer - && wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \ - && chmod u+x /usr/local/bin/composer \ - # php info - && php -v \ - && php -m \ - && php --ri swoole \ - && php --ri Zend\ OPcache \ - && composer \ - # ---------- clear works ---------- - && apk del .build-deps \ - && rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/local/bin/php* \ - && echo -e "\033[42;37m Build Completed :).\033[0m\n" diff --git a/8.0/alpine/swow/Dockerfile b/8.0/alpine/swow/Dockerfile deleted file mode 100644 index 661e766..0000000 --- a/8.0/alpine/swow/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -# hyperf/hyperf:8.0 -# -# @link https://www.hyperf.io -# @document https://hyperf.wiki -# @contact group@hyperf.io -# @license https://github.com/hyperf/hyperf/blob/master/LICENSE - -ARG ALPINE_VERSION - -FROM hyperf/hyperf:8.0-alpine-v${ALPINE_VERSION}-base - -LABEL maintainer="Hyperf Developers " version="1.0" license="MIT" - -ARG SW_VERSION -ARG COMPOSER_VERSION - -## -# ---------- env settings ---------- -## -ENV SW_VERSION=${SW_VERSION:-"develop"} \ - COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \ - COMPOSER_ALLOW_SUPERUSER=1 \ - # install and remove building packages - PHPIZE_DEPS="autoconf automake gcc g++ make php8-dev php8-pear file re2c openssl-dev curl-dev" - -# update -RUN set -ex \ - && apk update \ - # for swow extension libaio linux-headers - && apk add --no-cache openssl git bash \ - && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \ - # download - && cd /tmp \ - && curl -SL "https://github.com/swow/swow/archive/${SW_VERSION}.tar.gz" -o swow.tar.gz \ - && ls -alh \ - # php extension:swow - && cd /tmp \ - && mkdir -p swow \ - && tar -xf swow.tar.gz -C swow --strip-components=1 \ - && ln -s /usr/bin/phpize8 /usr/local/bin/phpize \ - && ln -s /usr/bin/php-config8 /usr/local/bin/php-config \ - && ( \ - cd swow/ext \ - && phpize \ - && ./configure --enable-swow --enable-swow-ssl --enable-swow-curl \ - && make -s -j$(nproc) && make install \ - ) \ - && echo "memory_limit=1G" > /etc/php8/conf.d/00_default.ini \ - && echo "opcache.enable_cli = 'On'" >> /etc/php8/conf.d/00_opcache.ini \ - && echo "extension=swow.so" > /etc/php8/conf.d/50_swow.ini \ - # install composer - && wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \ - && chmod u+x /usr/local/bin/composer \ - # php info - && php -v \ - && php -m \ - && php --ri swow \ - && composer \ - # ---------- clear works ---------- - && apk del .build-deps \ - && rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/local/bin/php* \ - && echo -e "\033[42;37m Build Completed :).\033[0m\n" diff --git a/8.1/alpine/base/Dockerfile b/8.1/alpine/base/Dockerfile index 78e81f5..0c8bbba 100644 --- a/8.1/alpine/base/Dockerfile +++ b/8.1/alpine/base/Dockerfile @@ -40,7 +40,6 @@ RUN set -ex \ php81-openssl \ php81-pdo \ php81-pdo_mysql \ - php81-pdo_sqlite \ php81-phar \ php81-posix \ php81-redis \ diff --git a/8.1/alpine/dev/Dockerfile b/8.1/alpine/dev/Dockerfile index 716f76c..148b847 100644 --- a/8.1/alpine/dev/Dockerfile +++ b/8.1/alpine/dev/Dockerfile @@ -14,7 +14,7 @@ LABEL maintainer="Hyperf Developers " version="1.0" license="MI ARG COMPOSER_VERSION ARG PHP_BUILD_VERSION -ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \ +ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \ COMPOSER_ALLOW_SUPERUSER=1 ## diff --git a/8.1/alpine/swoole/Dockerfile b/8.1/alpine/swoole/Dockerfile index dd382f1..36c5b3e 100644 --- a/8.1/alpine/swoole/Dockerfile +++ b/8.1/alpine/swoole/Dockerfile @@ -18,8 +18,8 @@ ARG PHP_BUILD_VERSION ## # ---------- env settings ---------- ## -ENV SW_VERSION=${SW_VERSION:-"v5.0.0"} \ - COMPOSER_VERSION=${COMPOSER_VERSION:-"2.3.10"} \ +ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \ + COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \ COMPOSER_ALLOW_SUPERUSER=1 \ # install and remove building packages 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" diff --git a/8.2/alpine/base/Dockerfile b/8.2/alpine/base/Dockerfile index 92faf9c..b0a3b6d 100644 --- a/8.2/alpine/base/Dockerfile +++ b/8.2/alpine/base/Dockerfile @@ -40,7 +40,6 @@ RUN set -ex \ php82-openssl \ php82-pdo \ php82-pdo_mysql \ - php82-pdo_sqlite \ php82-phar \ php82-posix \ php82-redis \ diff --git a/8.2/alpine/dev/Dockerfile b/8.2/alpine/dev/Dockerfile index 1c6a7b8..053f7b7 100644 --- a/8.2/alpine/dev/Dockerfile +++ b/8.2/alpine/dev/Dockerfile @@ -14,7 +14,7 @@ LABEL maintainer="Hyperf Developers " version="1.0" license="MI ARG COMPOSER_VERSION ARG PHP_BUILD_VERSION -ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \ +ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \ COMPOSER_ALLOW_SUPERUSER=1 ## diff --git a/8.2/alpine/swoole/Dockerfile b/8.2/alpine/swoole/Dockerfile index e5d23a7..bfb7a52 100644 --- a/8.2/alpine/swoole/Dockerfile +++ b/8.2/alpine/swoole/Dockerfile @@ -18,8 +18,8 @@ ARG PHP_BUILD_VERSION ## # ---------- env settings ---------- ## -ENV SW_VERSION=${SW_VERSION:-"v5.0.0"} \ - COMPOSER_VERSION=${COMPOSER_VERSION:-"2.3.10"} \ +ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \ + COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \ COMPOSER_ALLOW_SUPERUSER=1 \ # install and remove building packages 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" diff --git a/8.3/alpine/base/Dockerfile b/8.3/alpine/base/Dockerfile index ec05fc2..fd56312 100644 --- a/8.3/alpine/base/Dockerfile +++ b/8.3/alpine/base/Dockerfile @@ -40,7 +40,6 @@ RUN set -ex \ php83-openssl \ php83-pdo \ php83-pdo_mysql \ - php83-pdo_sqlite \ php83-phar \ php83-posix \ php83-redis \ diff --git a/8.3/alpine/dev/Dockerfile b/8.3/alpine/dev/Dockerfile index b2b768f..e7a195a 100644 --- a/8.3/alpine/dev/Dockerfile +++ b/8.3/alpine/dev/Dockerfile @@ -14,7 +14,7 @@ LABEL maintainer="Hyperf Developers " version="1.0" license="MI ARG COMPOSER_VERSION ARG PHP_BUILD_VERSION -ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \ +ENV COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \ COMPOSER_ALLOW_SUPERUSER=1 ## diff --git a/8.3/alpine/swoole/Dockerfile b/8.3/alpine/swoole/Dockerfile index 4850754..7bf0988 100644 --- a/8.3/alpine/swoole/Dockerfile +++ b/8.3/alpine/swoole/Dockerfile @@ -18,8 +18,8 @@ ARG PHP_BUILD_VERSION ## # ---------- env settings ---------- ## -ENV SW_VERSION=${SW_VERSION:-"v5.0.0"} \ - COMPOSER_VERSION=${COMPOSER_VERSION:-"2.3.10"} \ +ENV SW_VERSION=${SW_VERSION:-"v5.1.1"} \ + COMPOSER_VERSION=${COMPOSER_VERSION:-"2.6.6"} \ COMPOSER_ALLOW_SUPERUSER=1 \ # install and remove building packages 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" diff --git a/README.md b/README.md index 88638fd..066fda7 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,6 @@ pcntl pcre PDO pdo_mysql -pdo_sqlite Phar posix readline @@ -82,6 +81,45 @@ zlib Zend OPcache ``` +The Swoole info like the code below: + +```shell +swoole + +Swoole => enabled +Author => Swoole Team +Version => 5.1.1 +Built => Dec 11 2023 01:47:26 +coroutine => enabled with boost asm context +epoll => enabled +eventfd => enabled +signalfd => enabled +spinlock => enabled +rwlock => enabled +openssl => OpenSSL 3.1.4 24 Oct 2023 +dtls => enabled +http2 => enabled +json => enabled +curl-native => enabled +pcre => enabled +c-ares => 1.19.1 +zlib => 1.2.13 +brotli => E16777225/D16777225 +mutex_timedlock => enabled +pthread_barrier => enabled +async_redis => enabled +coroutine_pgsql => enabled + +Directive => Local Value => Master Value +swoole.enable_coroutine => On => On +swoole.enable_library => On => On +swoole.enable_fiber_mock => Off => Off +swoole.enable_preemptive_scheduler => Off => Off +swoole.display_errors => On => On +swoole.use_shortname => Off => Off +swoole.unixsock_buffer_size => 8388608 => 8388608 +``` + ## more demo ### PHP 8.x