merge develop into master 20231220

2024-02-10 07:44:52 +00:00
parent 53a3cd6a19
commit ce4819685b
50 changed files with 861 additions and 65 deletions
--- a/tools/docker/standalone/step_2_boot/_boot
+++ b/tools/docker/standalone/step_2_boot/_boot
@ -246,7 +246,11 @@ fi
 if [ $? -eq 0 ]; then
  echo "boot success!"
  # close the enable_rich_error_msg
-  obclient -h127.1 -uroot@sys -A -P${OB_MYSQL_PORT} -e "alter system set enable_rich_error_msg = false;"
+  PASSWORD_ARG=""
+  if [ "${OB_ROOT_PASSWORD}" != "" ]; then
+    PASSWORD_ARG="-p${OB_ROOT_PASSWORD}"
+  fi
+  obclient -h127.1 -uroot@sys -A -P${OB_MYSQL_PORT} ${PASSWORD_ARG} -e "alter system set enable_rich_error_msg = false;"
 else
  echo "boot failed!"
  if exit_while_error