This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new b35867116c1 branch-3.0: [fix](docker) Starting thirdpaty script with
only the reserve-ports parameter does not work #47578 (#47590)
b35867116c1 is described below
commit b35867116c1ec10a5404076f70cbd3ad7b32eb95
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Feb 8 15:01:35 2025 +0800
branch-3.0: [fix](docker) Starting thirdpaty script with only the
reserve-ports parameter does not work #47578 (#47590)
Cherry-picked from #47578
Co-authored-by: zgxme <zhenggaoxi...@selectdb.com>
---
docker/thirdparties/run-thirdparties-docker.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/docker/thirdparties/run-thirdparties-docker.sh
b/docker/thirdparties/run-thirdparties-docker.sh
index 1e1fb9481c3..adb3a70f095 100755
--- a/docker/thirdparties/run-thirdparties-docker.sh
+++ b/docker/thirdparties/run-thirdparties-docker.sh
@@ -42,6 +42,8 @@ Usage: $0 <options>
"
exit 1
}
+DEFAULT_COMPONENTS="mysql,es,hive2,hive3,pg,oracle,sqlserver,clickhouse,mariadb,iceberg,db2,oceanbase,kerberos,minio"
+ALL_COMPONENTS="${DEFAULT_COMPONENTS},hudi,trino,kafka,spark,lakesoul"
COMPONENTS=$2
HELP=0
STOP=0
@@ -62,7 +64,7 @@ eval set -- "${OPTS}"
if [[ "$#" == 1 ]]; then
# default
-
COMPONENTS="mysql,es,hive2,hive3,pg,oracle,sqlserver,clickhouse,mariadb,iceberg,db2,oceanbase,kerberos,minio"
+ COMPONENTS="${DEFAULT_COMPONENTS}"
else
while true; do
case "$1" in
@@ -98,7 +100,10 @@ else
done
if [[ "${COMPONENTS}"x == ""x ]]; then
if [[ "${STOP}" -eq 1 ]]; then
-
COMPONENTS="mysql,es,pg,oracle,sqlserver,clickhouse,hive2,hive3,iceberg,hudi,trino,kafka,mariadb,db2,oceanbase,kerberos,lakesoul"
+ COMPONENTS="${ALL_COMPONENTS}"
+ fi
+ if [[ "${NEED_RESERVE_PORTS}" -eq 1 ]]; then
+ COMPONENTS="${DEFAULT_COMPONENTS}"
fi
fi
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
