You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2023/05/16 03:41:40 UTC

[rocketmq-connect] branch master updated: [ISSUES #503] fix docker start bug and docker support replicator

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

jinrongtong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-connect.git


The following commit(s) were added to refs/heads/master by this push:
     new 142d7bb6  [ISSUES #503] fix docker start bug and docker support replicator
142d7bb6 is described below

commit 142d7bb6816612cfc39df2aa0d6e68e6b9102bd5
Author: zhoubo <87...@qq.com>
AuthorDate: Tue May 16 11:41:35 2023 +0800

     [ISSUES #503] fix docker start bug and docker support replicator
---
 distribution/conf/connect-distributed.conf                   |  7 +++++--
 docker/connect/Dockerfile                                    |  9 ++++-----
 docker/connect/README.md                                     | 12 ++++++++++++
 docker/connect/build_image.sh                                | 11 ++++++++++-
 .../src/main/resources/connect-distributed.conf              |  4 ++--
 .../src/main/resources/connect-standalone.conf               |  4 ++--
 6 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/distribution/conf/connect-distributed.conf b/distribution/conf/connect-distributed.conf
index 030a7a78..1c6c933b 100644
--- a/distribution/conf/connect-distributed.conf
+++ b/distribution/conf/connect-distributed.conf
@@ -14,7 +14,7 @@
 #  limitations under the License.
 
 workerId=DEFAULT_WORKER_1
-storePathRootDir=/home/connect/mq-connect/storeRoot
+storePathRootDir=/tmp/storeRoot1
 
 ## Http port for user to access REST API
 httpPort=8082
@@ -28,10 +28,13 @@ accessKey=rocketmq
 secretKey=12345678
 
 autoCreateGroupEnable=false
-clusterName="cluster1"
+clusterName="DefaultCluster"
 
 # Source or sink connector jar file dir,The default value is rocketmq-connect-sample
 pluginPaths=/home/connect/mq-connect/plugins,rocketmq-connect-sample/target/rocketmq-connect-sample-0.0.1-SNAPSHOT.jar
 
 
+# metrics config path
+#metricsConfigPath=/home/connect/mq-connect/conf/metrics.conf
+
 
diff --git a/docker/connect/Dockerfile b/docker/connect/Dockerfile
index 3addda32..77967f2c 100644
--- a/docker/connect/Dockerfile
+++ b/docker/connect/Dockerfile
@@ -34,13 +34,12 @@ EXPOSE 8082
 
 USER ${user}
 #WORKDIR /home/connect
+ENV JAVA_HOME /lib/jvm/java-1.8.0-openjdk
+ENV CLASSPATH .:$JAVA_HOME/lib
+ENV PATH $PATH:$JAVA_HOME/bin
 
 RUN mkdir -p /home/connect/mq-connect/bin /home/connect/mq-connect/plugins /home/connect/mq-connect/target /home/connect/mq-connect/cli && \
-    chown -R connect:connect /home/connect/ && \
-    echo "export JAVA_HOME=/lib/jvm/java-1.8.0-openjdk" >> ~/.bash_profile && \
-    echo "export PATH=$PATH:/lib/jvm/java-1.8.0-openjdk/bin" >> ~/.bash_profile && \
-    echo "export CLASSPATH=.:/lib/jvm/java-1.8.0-openjdk/lib" >> ~/.bash_profile && \
-    source ~/.bash_profile
+    chown -R connect:connect /home/connect/
 
 COPY ./plugins/*.jar /home/connect/mq-connect/plugins/
 ADD runtime.tar.gz /home/connect/mq-connect/
diff --git a/docker/connect/README.md b/docker/connect/README.md
index e802358b..a28ff251 100644
--- a/docker/connect/README.md
+++ b/docker/connect/README.md
@@ -24,6 +24,18 @@ sh build_image.sh
 
 ##启动Connector
 
+使用默认connect-distributed.conf启动
+
 ```
 docker run  --name rmqconnect --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" -p 8082:8082 apache/rocketmqconnect:0.0.1-SNAPSHOT sh /home/connect/mq-connect/bin/connect-distributed.sh -c /home/connect/mq-connect/conf/connect-distributed.conf
+```
+
+使用自定义配置启动
+
+替换自定义connect-distributed.conf配置
+
+可以将 ~/rocketmq-connect/distribution/conf/connect-distributed.conf 替换为自定义的配置
+
+```
+docker run -d -v ~/rocketmq-connect/distribution/conf/connect-distributed.conf:/home/connect/mq-connect/conf/connect-distributed.conf  --name rmqconnect --link rmqnamesrv:namesrv -e "NAMESRV_ADDR=namesrv:9876" -p 8082:8082  apache/rocketmqconnect:0.0.1-SNAPSHOT  sh /home/connect/mq-connect/bin/connect-distributed.sh -c /home/connect/mq-connect/conf/connect-distributed.conf
 ```
\ No newline at end of file
diff --git a/docker/connect/build_image.sh b/docker/connect/build_image.sh
index b36e3d8f..f3077a18 100644
--- a/docker/connect/build_image.sh
+++ b/docker/connect/build_image.sh
@@ -22,7 +22,7 @@ cd `dirname $0`
 
 WORK_DIR=`pwd`
 
-mvn clean package -DskipTests -Dmaven.test.skip=true -U
+mvn clean install -DskipTests -Dmaven.test.skip=true -U
 
 if test -f ${WORK_DIR}/docker/connect/distribution.tar.gz; then
     rm -f ${WORK_DIR}/docker/connect/distribution.tar.gz
@@ -36,6 +36,10 @@ if test -f ${WORK_DIR}/docker/connect/rocketmq-connect-sample-0.0.1-SNAPSHOT.jar
     rm -f ${WORK_DIR}/docker/connect/rocketmq-connect-sample-0.0.1-SNAPSHOT.jar
 fi
 
+if test -f ${WORK_DIR}/docker/connect/rocketmq-replicator-0.1.0-SNAPSHOT-jar-with-dependencies.jar; then
+    rm -f ${WORK_DIR}/docker/connect/rocketmq-replicator-0.1.0-SNAPSHOT-jar-with-dependencies.jar
+fi
+
 cd ${WORK_DIR}/rocketmq-connect-runtime/target/
 
 mv distribution.tar.gz runtime.tar.gz
@@ -51,6 +55,11 @@ cd ${WORK_DIR}/rocketmq-connect-sample/target
 
 cp rocketmq-connect-sample-0.0.1-SNAPSHOT.jar ${WORK_DIR}/docker/connect/plugins/
 
+cd ${WORK_DIR}/connectors/rocketmq-replicator/
+mvn clean package -DskipTests -Dmaven.test.skip=true -U
+cd ${WORK_DIR}/connectors/rocketmq-replicator/target
+cp rocketmq-replicator-0.1.0-SNAPSHOT-jar-with-dependencies.jar ${WORK_DIR}/docker/connect/plugins/
+
 CONNECT_VERSION=0.0.1-SNAPSHOT
 
 cd ${WORK_DIR}/docker/connect
diff --git a/rocketmq-connect-runtime/src/main/resources/connect-distributed.conf b/rocketmq-connect-runtime/src/main/resources/connect-distributed.conf
index e86b42af..0f3508fd 100644
--- a/rocketmq-connect-runtime/src/main/resources/connect-distributed.conf
+++ b/rocketmq-connect-runtime/src/main/resources/connect-distributed.conf
@@ -28,13 +28,13 @@ accessKey=rocketmq
 secretKey=12345678
 
 autoCreateGroupEnable=false
-clusterName="cluster1"
+clusterName="DefaultCluster"
 
 # Source or sink connector jar file dir,The default value is rocketmq-connect-sample
 pluginPaths=/home/connect/mq-connect/plugins
 
 # metrics config path
-metricsConfigPath=/xxx/metrics.conf
+#metricsConfigPath=/home/connect/mq-connect/conf/metrics.conf
 
 # Cluster management service config
 clusterManagementService=org.apache.rocketmq.connect.runtime.service.ClusterManagementServiceImpl
diff --git a/rocketmq-connect-runtime/src/main/resources/connect-standalone.conf b/rocketmq-connect-runtime/src/main/resources/connect-standalone.conf
index e2df207c..24c0ae07 100644
--- a/rocketmq-connect-runtime/src/main/resources/connect-standalone.conf
+++ b/rocketmq-connect-runtime/src/main/resources/connect-standalone.conf
@@ -28,12 +28,12 @@ accessKey=rocketmq
 secretKey=12345678
 
 autoCreateGroupEnable=false
-clusterName="cluster1"
+clusterName="DefaultCluster"
 
 # Source or sink connector jar file dir,The default value is rocketmq-connect-sample
 pluginPaths=/home/connect/mq-connect/plugins
 
 # metrics config path
-metricsConfigPath=/xxx/metrics.conf
+#metricsConfigPath=/home/connect/mq-connect/conf/metrics.conf