From b4cbaaaa994afcf6ea70d3fab23c3340bc24c642 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sun, 21 Mar 2021 23:00:30 +0800 Subject: [PATCH 1/5] github ci corver workspace extension --- .github/workflows/main-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 59641b8..0a5ea22 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -23,7 +23,7 @@ jobs: PHP_VERSION: ${{ matrix.php_version }} run: | cp env-example .env - sed -i -- '202,274s/=false/=true/g' .env + sed -i -- '99,274s/=false/=true/g' .env sed -i -- 's/GNUPG=false/GNUPG=true/g' .env sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env From b6666363eb15de0087e16e26e310f353a8048147 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Mon, 22 Mar 2021 00:40:59 +0800 Subject: [PATCH 2/5] feat(fix swoole extension) | workspace --- workspace/Dockerfile | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 14461dd..d675f10 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -588,20 +588,17 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ ARG INSTALL_SWOOLE=false RUN if [ ${INSTALL_SWOOLE} = true ]; then \ - # Install Php Swoole Extension - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - pecl -q install swoole-2.0.11; \ - else \ - if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ - echo '' | pecl install swoole-4.3.5; \ + # Install Php Swoole Extension + if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \ + pecl install swoole-2.0.11; \ + elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + pecl install swoole-4.3.5; \ + elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ + pecl install swoole-4.5.11; \ else \ - if [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \ - echo '' | pecl install swoole-4.6.0; \ - else \ - echo '' | pecl install swoole; \ - fi \ - fi \ - fi && \ + pecl install swoole; \ + fi; \ + fi; \ echo "extension=swoole.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/swoole.ini && \ ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/swoole.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-swoole.ini \ && php -m | grep -q 'swoole' \ From e1d2d810995ab7bce53c855c0fb616d7f405df89 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Mon, 22 Mar 2021 16:27:46 +0800 Subject: [PATCH 3/5] feat(fix swoole extension) | PHP 5.6 https://github.com/swoole/swoole-src/issues/2379#issuecomment-466613684 --- php-fpm/Dockerfile | 2 +- workspace/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index d44ab4f..7f82269 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -304,7 +304,7 @@ RUN set -eux; \ if [ ${INSTALL_SWOOLE} = true ]; then \ # Install Php Swoole Extension if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \ - pecl install swoole-2.0.11; \ + pecl install swoole-2.0.10; \ elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ pecl install swoole-4.3.5; \ elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ diff --git a/workspace/Dockerfile b/workspace/Dockerfile index d675f10..ec08929 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -590,7 +590,7 @@ ARG INSTALL_SWOOLE=false RUN if [ ${INSTALL_SWOOLE} = true ]; then \ # Install Php Swoole Extension if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \ - pecl install swoole-2.0.11; \ + pecl install swoole-2.0.10; \ elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ pecl install swoole-4.3.5; \ elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ From bd9c1e52c069b4a413e6e4ddc9f67c83e2918611 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Mon, 22 Mar 2021 16:43:30 +0800 Subject: [PATCH 4/5] feat(CI build skip V8JS) | workspace --- .github/workflows/main-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 0a5ea22..03be7ae 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -38,6 +38,7 @@ jobs: sed -i -- 's/MEMCACHED=true/MEMCACHED=false/g' .env sed -i -- 's/OCI8=true/OCI8=false/g' .env sed -i -- 's/IONCUBE=true/IONCUBE=false/g' .env + sed -i -- 's/V8JS=true/V8JS=false/g' .env docker-compose build ${{ matrix.service }} build-other: From 2e9ad09861c05b6251cfed5470eae6a5b244b5a0 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Mon, 22 Mar 2021 18:34:44 +0800 Subject: [PATCH 5/5] feat(fix xmlrpc) | workspace --- workspace/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index ec08929..25f8647 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1521,7 +1521,7 @@ RUN if [ ${INSTALL_GIT_PROMPT} = true ]; then \ ARG INSTALL_XMLRPC=false RUN if [ ${INSTALL_XMLRPC} = true ]; then \ - docker-php-ext-install xmlrpc \ + apt-get install -yqq php${LARADOCK_PHP_VERSION}-xmlrpc \ ;fi ###########################################################################