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/02 01:23:22 UTC
[incubator-inlong] branch master updated: [INLONG-1413][tubemq]
init tubemq cluster for tubemq manager docker image (#1414)
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 85b5e61 [INLONG-1413][tubemq] init tubemq cluster for tubemq manager docker image (#1414)
85b5e61 is described below
commit 85b5e61ebde9271cba8f95c2c6f411a884e4e02f
Author: dockerzhang <do...@apache.org>
AuthorDate: Mon Aug 2 09:23:14 2021 +0800
[INLONG-1413][tubemq] init tubemq cluster for tubemq manager docker image (#1414)
Co-authored-by: dockerzhang <do...@tencent.com>
---
inlong-tubemq/tubemq-docker/tubemq-manager/Dockerfile | 6 +++++-
inlong-tubemq/tubemq-docker/tubemq-manager/README.md | 14 ++++++--------
.../tubemq-docker/tubemq-manager/manager-docker.sh | 11 +++++++++--
.../src/main/resources/application.properties | 2 +-
4 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/inlong-tubemq/tubemq-docker/tubemq-manager/Dockerfile b/inlong-tubemq/tubemq-docker/tubemq-manager/Dockerfile
index 6ff2f14..4d38f48 100644
--- a/inlong-tubemq/tubemq-docker/tubemq-manager/Dockerfile
+++ b/inlong-tubemq/tubemq-docker/tubemq-manager/Dockerfile
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-FROM openjdk:8-jdk-alpine
+FROM openjdk:8-jdk
# add tarball from target output
ARG TUBEMQ_MANAGER_TARBALL
ADD ${TUBEMQ_MANAGER_TARBALL} /opt/tubemq-manager
@@ -25,6 +25,10 @@ ENV MYSQL_HOST=127.0.0.1
ENV MYSQL_PORT=3306
ENV MYSQL_USER=root
ENV MYSQL_PASSWD=inlong
+ENV TUBE_MASTER_IP=127.0.0.1
+ENV TUBE_MASTER_PORT=8715
+ENV TUBE_MASTER_WEB_PORT=8080
+ENV TUBE_MASTER_TOKEN=abc
WORKDIR /opt/tubemq-manager
ADD manager-docker.sh bin/
RUN chmod +x bin/manager-docker.sh
diff --git a/inlong-tubemq/tubemq-docker/tubemq-manager/README.md b/inlong-tubemq/tubemq-docker/tubemq-manager/README.md
index 77e24ee..b693a9f 100644
--- a/inlong-tubemq/tubemq-docker/tubemq-manager/README.md
+++ b/inlong-tubemq/tubemq-docker/tubemq-manager/README.md
@@ -8,15 +8,13 @@ docker pull inlong/tubemq-manager:latest
##### Start Container
- start MySQL 5.7+
+- start TubeMQ Server
- run Container
```
-docker run -d --name manager -p 8089:8089 -e MYSQL_HOST=127.0.0.1 \
--e MYSQL_USER=root -e MYSQL_PASSWD=inlong inlong/tubemq-manager
-```
-#### Add TubeMQ Cluster to Manager
-```
-curl --header "Content-Type: application/json" --request POST --data \
-'{"masterIp":"master_ip","clusterName":"inlong","masterPort":"8715","masterWebPort":"8080","createUser":"manager","token":"abc"}' \
-http://127.0.0.1:8089/v1/cluster?method=add
+docker run -d --name manager -p 8089:8089 \
+-e MYSQL_HOST=127.0.0.1 -e MYSQL_USER=root -e MYSQL_PASSWD=inlong \
+-e TUBE_MASTER_IP=127.0.0.1 -e TUBE_MASTER_PORT=8715 \
+-e TUBE_MASTER_WEB_PORT=8080 -e TUBE_MASTER_TOKEN=abc \
+inlong/tubemq-manager
```
\ No newline at end of file
diff --git a/inlong-tubemq/tubemq-docker/tubemq-manager/manager-docker.sh b/inlong-tubemq/tubemq-docker/tubemq-manager/manager-docker.sh
index 203e2b7..3c9aeac 100644
--- a/inlong-tubemq/tubemq-docker/tubemq-manager/manager-docker.sh
+++ b/inlong-tubemq/tubemq-docker/tubemq-manager/manager-docker.sh
@@ -24,7 +24,7 @@ spring.jpa.hibernate.ddl-auto=update
topic.config.schedule=0/5 * * * * ?
broker.reload.schedule=0/5 * * * * ?
# mysql configuration for manager
-spring.datasource.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/tubemanager
+spring.datasource.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/tubemanager?useSSL=false
spring.datasource.username=$MYSQL_USER
spring.datasource.password=$MYSQL_PASSWD
# server port
@@ -32,6 +32,13 @@ server.port=8089
EOF
# start
sh ${file_path}/start-manager.sh
-sleep 3
+# init cluster
+until $(curl --output /dev/null --silent --head --fail http://localhost:8089); do
+ sleep 3
+done
+curl --header "Content-Type: application/json" --request POST --data \
+'{"masterIp":"'"$TUBE_MASTER_IP"'","clusterName":"inlong","masterPort":"'"$TUBE_MASTER_PORT"'","masterWebPort":"'"$TUBE_MASTER_WEB_PORT"'","createUser":"manager","token":"'"$TUBE_MASTER_TOKEN"'"}' \
+http://localhost:8089/v1/cluster?method=add
+
# keep alive
tail -F ${file_path}/../logs/tubemq-manager.out
\ No newline at end of file
diff --git a/inlong-tubemq/tubemq-manager/src/main/resources/application.properties b/inlong-tubemq/tubemq-manager/src/main/resources/application.properties
index 5c023ce..b8b789a 100644
--- a/inlong-tubemq/tubemq-manager/src/main/resources/application.properties
+++ b/inlong-tubemq/tubemq-manager/src/main/resources/application.properties
@@ -19,7 +19,7 @@ spring.jpa.hibernate.ddl-auto=update
topic.config.schedule=0/5 * * * * ?
broker.reload.schedule=0/5 * * * * ?
# mysql configuration for manager
-# spring.datasource.url=jdbc:mysql://mysql_ip:mysql_port/tubemanager
+# spring.datasource.url=jdbc:mysql://mysql_ip:mysql_port/tubemanager?useSSL=false
# spring.datasource.username=mysql_username
# spring.datasource.password=mysql_password
# server port