This is an automated email from the ASF dual-hosted git repository.
zykkk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new e3142fe5b55 [fix](docker) fix docker entrypoint script adminUser grep
rule (#49343)
e3142fe5b55 is described below
commit e3142fe5b5580b6d948e0f4ea6683f1eefaa5562
Author: catpineapple <1391869...@qq.com>
AuthorDate: Tue Mar 25 14:52:06 2025 +0800
[fix](docker) fix docker entrypoint script adminUser grep rule (#49343)
---
docker/runtime/be/resource/be_disaggregated_entrypoint.sh | 2 +-
docker/runtime/be/resource/be_entrypoint.sh | 2 +-
docker/runtime/fe/resource/fe_disaggregated_entrypoint.sh | 2 +-
docker/runtime/fe/resource/fe_entrypoint.sh | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docker/runtime/be/resource/be_disaggregated_entrypoint.sh
b/docker/runtime/be/resource/be_disaggregated_entrypoint.sh
index 6bd8796ab3d..9f0110dcac5 100755
--- a/docker/runtime/be/resource/be_disaggregated_entrypoint.sh
+++ b/docker/runtime/be/resource/be_disaggregated_entrypoint.sh
@@ -208,7 +208,7 @@ function create_account()
log_stderr "the 'root' account have set password! not need auto create
management account."
return 0
fi
- if echo $users | grep -q -w "$DB_ADMIN_USER" &>/dev/null; then
+ if echo $users | awk '{print $1}' | grep -q -w "$DB_ADMIN_USER"
&>/dev/null; then
log_stderr "the $DB_ADMIN_USER have exist in doris."
return 0
fi
diff --git a/docker/runtime/be/resource/be_entrypoint.sh
b/docker/runtime/be/resource/be_entrypoint.sh
index 41f77a936c7..8848f1e4841 100755
--- a/docker/runtime/be/resource/be_entrypoint.sh
+++ b/docker/runtime/be/resource/be_entrypoint.sh
@@ -250,7 +250,7 @@ function create_account()
log_stderr "the 'root' account have set password! not need auto create
management account."
return 0
fi
- if echo $users | grep -q -w "$DB_ADMIN_USER" &>/dev/null; then
+ if echo $users | awk '{print $1}' | grep -q -w "$DB_ADMIN_USER"
&>/dev/null; then
log_stderr "the $DB_ADMIN_USER have exist in doris."
return 0
fi
diff --git a/docker/runtime/fe/resource/fe_disaggregated_entrypoint.sh
b/docker/runtime/fe/resource/fe_disaggregated_entrypoint.sh
index 699b47d2ec5..5a940bdc984 100755
--- a/docker/runtime/fe/resource/fe_disaggregated_entrypoint.sh
+++ b/docker/runtime/fe/resource/fe_disaggregated_entrypoint.sh
@@ -356,7 +356,7 @@ create_account()
return 0
fi
- if echo $users | grep -q -w "$DB_ADMIN_USER" &>/dev/null; then
+ if echo $users | awk '{print $1}' | grep -q -w "$DB_ADMIN_USER"
&>/dev/null; then
log_stderr "the $DB_ADMIN_USER have exit in doris."
return 0
fi
diff --git a/docker/runtime/fe/resource/fe_entrypoint.sh
b/docker/runtime/fe/resource/fe_entrypoint.sh
index 6076ef55b1a..83e41ab46aa 100755
--- a/docker/runtime/fe/resource/fe_entrypoint.sh
+++ b/docker/runtime/fe/resource/fe_entrypoint.sh
@@ -422,8 +422,8 @@ create_account()
return 0
fi
- if echo $users | grep -q -w "$DB_ADMIN_USER" &>/dev/null; then
- log_stderr "the $DB_ADMIN_USER have exit in doris."
+ if echo $users | awk '{print $1}' | grep -q -w "$DB_ADMIN_USER"
&>/dev/null; then
+ log_stderr "the $DB_ADMIN_USER have exist in doris."
return 0
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
