This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 d839f55ae [INLONG-4838][Docker] Add MQ Type environment for Audit and
DataProxy (#4839)
d839f55ae is described below
commit d839f55aeef79c88ece522556bee085d2a7cf439
Author: Charles Zhang <[email protected]>
AuthorDate: Sun Jul 3 22:19:01 2022 +0800
[INLONG-4838][Docker] Add MQ Type environment for Audit and DataProxy
(#4839)
Co-authored-by: Yuanhao Ji <[email protected]>
---
docker/docker-compose/docker-compose.yml | 2 ++
inlong-audit/audit-docker/Dockerfile | 2 +-
inlong-audit/audit-docker/audit-docker.sh | 17 ++++++++++++-----
inlong-dataproxy/dataproxy-docker/Dockerfile | 2 ++
inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh | 13 ++++++++++---
5 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/docker/docker-compose/docker-compose.yml
b/docker/docker-compose/docker-compose.yml
index 3706e65a8..6c40e36b3 100644
--- a/docker/docker-compose/docker-compose.yml
+++ b/docker/docker-compose/docker-compose.yml
@@ -79,6 +79,7 @@ services:
- MANAGER_OPENAPI_IP=manager
- MANAGER_OPENAPI_PORT=8083
- AUDIT_PROXY_URL=audit:10081
+ - MQ_TYPE=pulsar
agent:
image: inlong/agent:latest
@@ -108,5 +109,6 @@ services:
- USERNAME=root
- PASSWORD=inlong
- PULSAR_BROKER_LIST=pulsar:6650
+ - MQ_TYPE=pulsar
ports:
- "10081:10081"
diff --git a/inlong-audit/audit-docker/Dockerfile
b/inlong-audit/audit-docker/Dockerfile
index 870025546..671b9735c 100644
--- a/inlong-audit/audit-docker/Dockerfile
+++ b/inlong-audit/audit-docker/Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get update \
ARG AUDIT_TARBALL
ADD ${AUDIT_TARBALL} /opt/inlong-audit
EXPOSE 10081
-# pulsar or tube
+# pulsar or tubemq
ENV MQ_TYPE=pulsar
ENV PULSAR_BROKER_LIST="127.0.0.1:6650"
ENV TUBE_MASTER_LIST="localhost:8715"
diff --git a/inlong-audit/audit-docker/audit-docker.sh
b/inlong-audit/audit-docker/audit-docker.sh
index cfa7569b5..6ec614623 100755
--- a/inlong-audit/audit-docker/audit-docker.sh
+++ b/inlong-audit/audit-docker/audit-docker.sh
@@ -33,7 +33,7 @@ if [[ "${MQ_TYPE}" == "pulsar" ]]; then
sed -i "s/agent1.sinks.pulsar-sink-msg1.pulsar_server_url =
.*$/agent1.sinks.pulsar-sink-msg1.pulsar_server_url =
pulsar:\/\/${PULSAR_BROKER_LIST}/g" "${proxy_conf_file}"
sed -i "s/agent1.sinks.pulsar-sink-msg2.pulsar_server_url =
.*$/agent1.sinks.pulsar-sink-msg2.pulsar_server_url =
pulsar:\/\/${PULSAR_BROKER_LIST}/g" "${proxy_conf_file}"
fi
-if [[ "${MQ_TYPE}" == "tube" ]]; then
+if [[ "${MQ_TYPE}" == "tubemq" ]]; then
sed -i
"s/audit.tube.masterlist=.*$/audit.tube.masterlist=${TUBE_MASTER_LIST}/g"
"${store_conf_file}"
sed -i "s/agent1.sinks.tube-sink-msg1.master-host-port-list =
.*$/agent1.sinks.tube-sink-msg1.master-host-port-list = ${TUBE_MASTER_LIST}/g"
"${proxy_conf_file}"
sed -i "s/agent1.sinks.tube-sink-msg2.master-host-port-list =
.*$/agent1.sinks.tube-sink-msg2.master-host-port-list = ${TUBE_MASTER_LIST}/g"
"${proxy_conf_file}"
@@ -52,9 +52,16 @@ if [[ "${JDBC_URL}" =~ (.+):([0-9]+) ]]; then
fi
fi
-# start
-bash +x ${file_path}/bin/proxy-start.sh
-bash +x ${file_path}/bin/store-start.sh
+# start proxy
+cd "${file_path}/"
+if [[ "${MQ_TYPE}" == "pulsar" ]]; then
+ bash +x ./bin/proxy-start.sh pulsar
+fi
+if [[ "${MQ_TYPE}" == "tubemq" ]]; then
+ bash +x ./bin/proxy-start.sh tube
+fi
+# start store
+bash +x ./bin/store-start.sh
sleep 3
# keep alive
-tail -F ${file_path}/logs/info.log
+tail -F ./logs/info.log
diff --git a/inlong-dataproxy/dataproxy-docker/Dockerfile
b/inlong-dataproxy/dataproxy-docker/Dockerfile
index d8519131a..15d8520da 100644
--- a/inlong-dataproxy/dataproxy-docker/Dockerfile
+++ b/inlong-dataproxy/dataproxy-docker/Dockerfile
@@ -27,6 +27,8 @@ EXPOSE 46801
ENV MANAGER_OPENAPI_IP=127.0.0.1
ENV MANAGER_OPENAPI_PORT=8083
ENV AUDIT_PROXY_URL=127.0.0.1:10081
+# pulsar or tubemq
+ENV MQ_TYPE=pulsar
ENV DATAPROXY_JVM_HEAP_OPTS="-XX:+UseContainerSupport
-XX:InitialRAMPercentage=40.0 -XX:MaxRAMPercentage=80.0
-XX:-UseAdaptiveSizePolicy"
WORKDIR /opt/inlong-dataproxy
ADD dataproxy-docker.sh bin/
diff --git a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
index 1e26537d4..421948e66 100644
--- a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
+++ b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
@@ -18,12 +18,19 @@
file_path=$(cd "$(dirname "$0")"/../;pwd)
# config
-common_conf_file=${file_path}/conf/common.properties
+cd "${file_path}/"
+common_conf_file=./conf/common.properties
sed -i
"s/manager.hosts=.*$/manager.hosts=${MANAGER_OPENAPI_IP}:${MANAGER_OPENAPI_PORT}/g"
"${common_conf_file}"
sed -i "s/audit.proxys=.*$/audit.proxys=${AUDIT_PROXY_URL}/g"
"${common_conf_file}"
# start
-bash +x ${file_path}/bin/dataproxy-start.sh
+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
+fi
+
sleep 3
# keep alive
-tail -F ${file_path}/logs/info.log
+tail -F ./logs/info.log
\ No newline at end of file
