From 0359041ed431a7b27b321202a6e40d15b9fab7f1 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Sun, 6 Oct 2024 00:48:08 +0800 Subject: [PATCH 1/3] update build-release-example.sh --- build-release-example.sh | 15 +++++++++------ sapi/src/builder/enabled_extensions.php | 2 +- sapi/src/builder/library/gettext.php | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build-release-example.sh b/build-release-example.sh index 78c445d86..5a0e5dbcf 100644 --- a/build-release-example.sh +++ b/build-release-example.sh @@ -17,7 +17,7 @@ if [ ! -d ext/swoole/.git ]; then git submodule update --init --recursive fi -set -xue +set -x # shellcheck disable=SC2034 OS=$(uname -s) @@ -194,6 +194,7 @@ if [ ${WITH_PHP_COMPOSER} -eq 1 ]; then composer config -g --unset repos.packagist fi + # 可用配置参数 # --with-swoole-pgsql=1 # --with-libavif=1 @@ -259,6 +260,8 @@ if [ "$OS" = 'linux' ] && [ ${IN_DOCKER} -eq 0 ]; then exit 0 fi +set -ue + bash make-install-deps.sh # 兼容上一版本已构建完毕的依赖库 @@ -275,18 +278,18 @@ bash make.sh archive exit 0 # 例子 -# bash build-release.sh --mirror china -# bash build-release.sh --mirror china --debug +# bash build-release-php.sh --mirror china +# bash build-release-php.sh --mirror china --debug # 例子 download-box -# bash build-release.sh --mirror china --download-box +# bash build-release-php.sh --mirror china --download-box # bash sapi/download-box/download-box-init.sh --proxy http://192.168.3.26:8015 # 例子 build-contianer -# bash build-release.sh --mirror china --build-contianer +# bash build-release-php.sh --mirror china --build-contianer # bash sapi/multistage-build-dependencies-container/all-dependencies-build-container.sh --composer_mirror tencent --mirror ustc # 例子 web ui -# bash build-release.sh --mirror china --webui +# bash build-release-php.sh --mirror china --webui # bash sapi/webUI/webui-init-data.sh # php sapi/webUI/bootstrap.php diff --git a/sapi/src/builder/enabled_extensions.php b/sapi/src/builder/enabled_extensions.php index 3aeeecb52..f79cf510c 100644 --- a/sapi/src/builder/enabled_extensions.php +++ b/sapi/src/builder/enabled_extensions.php @@ -36,7 +36,7 @@ 'swoole', 'yaml', 'imagick', - //'mongodb', + 'mongodb', //'gettext', 'uuid' ]; diff --git a/sapi/src/builder/library/gettext.php b/sapi/src/builder/library/gettext.php index bedcbba26..d4824ddc9 100644 --- a/sapi/src/builder/library/gettext.php +++ b/sapi/src/builder/library/gettext.php @@ -21,7 +21,7 @@ ->withUrl('https://ftpmirror.gnu.org/gettext/gettext-0.22.5.tar.gz') ->withFileHash('sha256',"ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0") ->withPrefix($gettext_prefix) - ->withInstallCached(false) + //->withInstallCached(false) ->withConfigure( << Date: Sun, 6 Oct 2024 09:59:14 +0800 Subject: [PATCH 2/3] update swoole config --- .gitignore | 4 ++++ .../linux/conatiner-sync-swoole-cli.sh | 22 +++++++++++++++++++ sapi/src/builder/extension/imagick.php | 1 + sapi/src/builder/extension/swoole_latest.php | 1 + 4 files changed, 28 insertions(+) create mode 100644 sapi/quickstart/linux/conatiner-sync-swoole-cli.sh diff --git a/.gitignore b/.gitignore index 3ef95cdbd..88f5b4ac2 100644 --- a/.gitignore +++ b/.gitignore @@ -337,4 +337,8 @@ Makefile.backup ldflags.log cppflags.log libs.log +ext/apcu/ +ext/ssh2/ +LICENSE + diff --git a/sapi/quickstart/linux/conatiner-sync-swoole-cli.sh b/sapi/quickstart/linux/conatiner-sync-swoole-cli.sh new file mode 100644 index 000000000..557137f40 --- /dev/null +++ b/sapi/quickstart/linux/conatiner-sync-swoole-cli.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -exu +__DIR__=$( + cd "$(dirname "$0")" + pwd +) +cd ${__DIR__} + +# 容器之间同步 /usr/local/swoole-cli 目录 + +test -d /tmp/swoole-cli-builder && rm -rf /tmp/swoole-cli-builder + +docker cp swoole-cli-alpine-dev:/usr/local/swoole-cli/ /tmp/swoole-cli-builder + +docker cp /tmp/swoole-cli-builder swoole-cli-builder:/usr/local/swoole-cli + + +# docker cp /tmp/swoole-cli-builder swoole-cli-alpine-dev:/usr/local/swoole-cli + +# 运行的容器挂载目录 +# docker exec -it swoole-cli-builder mount --bind /tmp/swoole-cli-builder /usr/local/swoole-cli/ diff --git a/sapi/src/builder/extension/imagick.php b/sapi/src/builder/extension/imagick.php index 71285ce1c..52623e782 100644 --- a/sapi/src/builder/extension/imagick.php +++ b/sapi/src/builder/extension/imagick.php @@ -15,6 +15,7 @@ ->withMd5sum('f7b5e9b23fb844e5eb035203d316bc63') ->withDependentLibraries('imagemagick') ->withDependentExtensions('tokenizer') + ->withBuildCached(false) ); }; diff --git a/sapi/src/builder/extension/swoole_latest.php b/sapi/src/builder/extension/swoole_latest.php index 89e2b8504..952bf57d5 100644 --- a/sapi/src/builder/extension/swoole_latest.php +++ b/sapi/src/builder/extension/swoole_latest.php @@ -50,6 +50,7 @@ ) ->withOptions(implode(' ', $options)) ->withBuildCached(false) + ->withAutoUpdateFile() ->withDependentLibraries(...$dependentLibraries) ->withDependentExtensions(...$dependentExtensions)); From c2dc3be9726598fdbaeddf61239c6fd3d21d6d96 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Sun, 6 Oct 2024 10:04:07 +0800 Subject: [PATCH 3/3] update --- build-release-example.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-release-example.sh b/build-release-example.sh index 5a0e5dbcf..d495b5e2e 100644 --- a/build-release-example.sh +++ b/build-release-example.sh @@ -285,10 +285,6 @@ exit 0 # bash build-release-php.sh --mirror china --download-box # bash sapi/download-box/download-box-init.sh --proxy http://192.168.3.26:8015 -# 例子 build-contianer -# bash build-release-php.sh --mirror china --build-contianer -# bash sapi/multistage-build-dependencies-container/all-dependencies-build-container.sh --composer_mirror tencent --mirror ustc - # 例子 web ui # bash build-release-php.sh --mirror china --webui # bash sapi/webUI/webui-init-data.sh