You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2021/08/23 09:35:30 UTC
[incubator-inlong] branch master updated: [INLONG-1462][dataproxy]
fix the properties error (#1463)
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/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new f2b1660 [INLONG-1462][dataproxy] fix the properties error (#1463)
f2b1660 is described below
commit f2b1660a5cd3aca37dbbc7c57223367f5d7b9841
Author: dockerzhang <do...@apache.org>
AuthorDate: Mon Aug 23 17:35:22 2021 +0800
[INLONG-1462][dataproxy] fix the properties error (#1463)
Co-authored-by: dockerzhang <do...@tencent.com>
---
docker/docker-compose/docker-compose.yml | 2 ++
inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/docker/docker-compose/docker-compose.yml b/docker/docker-compose/docker-compose.yml
index 978969d..e5b8c4c 100644
--- a/docker/docker-compose/docker-compose.yml
+++ b/docker/docker-compose/docker-compose.yml
@@ -120,5 +120,7 @@ services:
- MANAGER_OPENAPI_PORT=8083
- DATAPROXY_IP=dataproxy
- DATAPROXY_PORT=46801
+ ports:
+ - "8008:8008"
volumes:
- ./collect-data:/data/collect-data
\ No newline at end of file
diff --git a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
index e92beaf..334a4b3 100644
--- a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
+++ b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
@@ -23,8 +23,8 @@ cat <<EOF > ${file_path}/conf/common.properties
manager_hosts=$MANAGER_OPENAPI_IP:$MANAGER_OPENAPI_PORT
EOF
# start
-sh ${file_path}/bin/prepare_env.sh
-sh ${file_path}/bin/dataproxy-start.sh
+bash +x ${file_path}/bin/prepare_env.sh
+bash +x ${file_path}/bin/dataproxy-start.sh
sleep 3
# keep alive
tail -F ${file_path}/logs/flume.log