[inlong] branch master updated: [INLONG-6389][Docker] Change the tube to tubemq (#6390)

[he...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new e5ff59012 [INLONG-6389][Docker] Change the tube to tubemq (#6390)
e5ff59012 is described below

commit e5ff59012a2c542b067c973304193abf496a7f1b
Author: Lucas <10...@users.noreply.github.com>
AuthorDate: Thu Nov 3 18:41:21 2022 +0800

    [INLONG-6389][Docker] Change the tube to tubemq (#6390)
---
 inlong-agent/agent-docker/agent-docker.sh                            | 2 --
 inlong-audit/audit-docker/audit-docker.sh                            | 2 +-
 inlong-audit/conf/{audit-proxy-tube.conf => audit-proxy-tubemq.conf} | 0
 inlong-dataproxy/conf/{dataproxy-tube.conf => dataproxy-tubemq.conf} | 0
 inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh                | 2 +-
 5 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/inlong-agent/agent-docker/agent-docker.sh b/inlong-agent/agent-docker/agent-docker.sh
index 864232787..51a2a6195 100644
--- a/inlong-agent/agent-docker/agent-docker.sh
+++ b/inlong-agent/agent-docker/agent-docker.sh
@@ -25,8 +25,6 @@ sed -i "s/agent.fetcher.interval=.*$/agent.fetcher.interval=$AGENT_FETCH_INTERVA
 sed -i "s/agent.heartbeat.interval=.*$/agent.heartbeat.interval=$AGENT_HEARTBEAT_INTERVAL/g" "${file_path}/conf/agent.properties"
 sed -i "s/agent.manager.vip.http.host=.*$/agent.manager.vip.http.host=$MANAGER_OPENAPI_IP/g" "${file_path}/conf/agent.properties"
 sed -i "s/agent.manager.vip.http.port=.*$/agent.manager.vip.http.port=$MANAGER_OPENAPI_PORT/g" "${file_path}/conf/agent.properties"
-sed -i "s/agent.dataproxy.http.host=.*$/agent.dataproxy.http.host=$DATAPROXY_IP/g" "${file_path}/conf/agent.properties"
-sed -i "s/agent.dataproxy.http.port=.*$/agent.dataproxy.http.port=$DATAPROXY_PORT/g" "${file_path}/conf/agent.properties"
 sed -i "s/audit.enable=.*$/audit.enable=$AUDIT_ENABLE/g" "${file_path}/conf/agent.properties"
 sed -i "s/audit.proxys=.*$/audit.proxys=$AUDIT_PROXY_URL/g" "${file_path}/conf/agent.properties"
 sed -i "s/agent.cluster.tag=.*$/agent.cluster.tag=$CLUSTER_TAG/g" "${file_path}/conf/agent.properties"
diff --git a/inlong-audit/audit-docker/audit-docker.sh b/inlong-audit/audit-docker/audit-docker.sh
index 28dde5431..5f05e8235 100755
--- a/inlong-audit/audit-docker/audit-docker.sh
+++ b/inlong-audit/audit-docker/audit-docker.sh
@@ -85,7 +85,7 @@ if [ "${START_MODE}" = "all" ] || [ "${START_MODE}" = "proxy" ]; then
     bash +x ./bin/proxy-start.sh pulsar
   fi
   if [ "${MQ_TYPE}" = "tubemq" ]; then
-    bash +x ./bin/proxy-start.sh tube
+    bash +x ./bin/proxy-start.sh tubemq
   fi
 fi
 # start store
diff --git a/inlong-audit/conf/audit-proxy-tube.conf b/inlong-audit/conf/audit-proxy-tubemq.conf
similarity index 100%
rename from inlong-audit/conf/audit-proxy-tube.conf
rename to inlong-audit/conf/audit-proxy-tubemq.conf
diff --git a/inlong-dataproxy/conf/dataproxy-tube.conf b/inlong-dataproxy/conf/dataproxy-tubemq.conf
similarity index 100%
rename from inlong-dataproxy/conf/dataproxy-tube.conf
rename to inlong-dataproxy/conf/dataproxy-tubemq.conf
diff --git a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
index ae6bae408..1280aeabe 100644
--- a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
+++ b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
@@ -36,7 +36,7 @@ if [ "${MQ_TYPE}" = "pulsar" ]; then
   bash +x ./bin/dataproxy-start.sh pulsar
 fi
 if [ "${MQ_TYPE}" = "tubemq" ]; then
-  bash +x ./bin/dataproxy-start.sh tube
+  bash +x ./bin/dataproxy-start.sh tubemq
 fi
 
 sleep 3