This is an automated email from the ASF dual-hosted git repository.
catpineapple 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 a73e16a53ad [fix](docker)Add a line break before the configuration.
(#56471)
a73e16a53ad is described below
commit a73e16a53ad6fb07f88c5871bcc3058ef39f43f3
Author: catpineapple <[email protected]>
AuthorDate: Fri Sep 26 17:53:46 2025 +0800
[fix](docker)Add a line break before the configuration. (#56471)
### What problem does this PR solve?
This is a defensive change. It adds a line break between the default
configuration and the original configuration to prevent missing line
breaks in the configmap configuration file.
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
docker/runtime/be/resource/be_disaggregated_entrypoint.sh | 1 +
docker/runtime/be/resource/be_entrypoint.sh | 1 +
docker/runtime/fe/resource/fe_disaggregated_entrypoint.sh | 1 +
docker/runtime/fe/resource/fe_entrypoint.sh | 1 +
docker/runtime/ms/resource/ms_disaggregated_entrypoint.sh | 1 +
5 files changed, 5 insertions(+)
diff --git a/docker/runtime/be/resource/be_disaggregated_entrypoint.sh
b/docker/runtime/be/resource/be_disaggregated_entrypoint.sh
index e9a52b4c467..91adb5224d4 100755
--- a/docker/runtime/be/resource/be_disaggregated_entrypoint.sh
+++ b/docker/runtime/be/resource/be_disaggregated_entrypoint.sh
@@ -77,6 +77,7 @@ function add_workloadgroup_config()
# update config add `deploy_mode`.
update_conf_from_configmap()
{
+ echo "" >> $DORIS_HOME/conf/be.conf
echo "deploy_mode = cloud" >> $DORIS_HOME/conf/be.conf
if [[ "x$CONFIGMAP_MOUNT_PATH" == "x" ]] ; then
log_stderr '[info] Empty $CONFIGMAP_MOUNT_PATH env var, skip it!'
diff --git a/docker/runtime/be/resource/be_entrypoint.sh
b/docker/runtime/be/resource/be_entrypoint.sh
index 8d157aa1bd9..247b894af87 100755
--- a/docker/runtime/be/resource/be_entrypoint.sh
+++ b/docker/runtime/be/resource/be_entrypoint.sh
@@ -51,6 +51,7 @@ log_stderr()
function add_workloadgroup_config()
{
+ echo "" >> ${DORIS_HOME}/conf/be.conf
if [[ "x$ENABLE_WORKLOAD_GROUP" == "xtrue" ]]; then
echo "doris_cgroup_cpu_path=$WORKLOAD_GROUP_PATH" >>
${DORIS_HOME}/conf/be.conf
fi
diff --git a/docker/runtime/fe/resource/fe_disaggregated_entrypoint.sh
b/docker/runtime/fe/resource/fe_disaggregated_entrypoint.sh
index 82db1578c3b..70aa54a6acf 100755
--- a/docker/runtime/fe/resource/fe_disaggregated_entrypoint.sh
+++ b/docker/runtime/fe/resource/fe_disaggregated_entrypoint.sh
@@ -364,6 +364,7 @@ function check_and_modify_fqdn_config()
function add_cluster_info_to_conf()
{
+ echo "" >> ${DORIS_HOME}/conf/fe.conf
echo "meta_service_endpoint=$MS_ENDPOINT" >> ${DORIS_HOME}/conf/fe.conf
echo "cluster_id=$CLUSTER_ID" >> ${DORIS_HOME}/conf/fe.conf
echo "deploy_mode=cloud" >> ${DORIS_HOME}/conf/fe.conf
diff --git a/docker/runtime/fe/resource/fe_entrypoint.sh
b/docker/runtime/fe/resource/fe_entrypoint.sh
index 641388cef8e..2210c2d0340 100755
--- a/docker/runtime/fe/resource/fe_entrypoint.sh
+++ b/docker/runtime/fe/resource/fe_entrypoint.sh
@@ -294,6 +294,7 @@ probe_master()
function add_fqdn_config()
{
+ echo "" >>${DORIS_HOME}/conf/fe.conf
# TODO(user):since selectdb/doris.fe-ubuntu:2.0.2 , `enable_fqdn_mode` is
forced to set `true` for starting doris. (enable_fqdn_mode = true).
local enable_fqdn=`parse_confval_from_fe_conf "enable_fqdn_mode"`
log_stderr "enable_fqdn is : $enable_fqdn"
diff --git a/docker/runtime/ms/resource/ms_disaggregated_entrypoint.sh
b/docker/runtime/ms/resource/ms_disaggregated_entrypoint.sh
index 5db4e007b38..c55e8b16ace 100755
--- a/docker/runtime/ms/resource/ms_disaggregated_entrypoint.sh
+++ b/docker/runtime/ms/resource/ms_disaggregated_entrypoint.sh
@@ -23,6 +23,7 @@ FDB_ENDPOINT=${FDB_ENDPOINT}
CONFIGMAP_PATH=${CONFIGMAP_PATH:="/etc/doris"}
DORIS_HOME=${DORIS_HOME:="/opt/apache-doris"}
+echo "" >> $DORIS_HOME/ms/conf/doris_cloud.conf
echo "fdb_cluster=$FDB_ENDPOINT" >> $DORIS_HOME/ms/conf/doris_cloud.conf
if [[ -d $CONFIGMAP_PATH ]]; then
for file in `ls $CONFIGMAP_PATH`
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
