Merge branch 'feature/tmr-group' of baishaojie/tmrgo into develop

.drone.yml

@@ -20,7 +20,7 @@ steps:
         from_secret: aliyun_password
       repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-tmr
       registry: registry.cn-hangzhou.aliyuncs.com
-      tags: [ shengmu25 ]   # shengmu25
+      tags: [ 1.0.3,latest ]
 
 trigger:
   branch:

Dockerfile

@@ -26,6 +26,6 @@ COPY --from=0 /app/kpt-tmr/conf/* /app/kpt-tmr/bin/conf/
 COPY --from=0  /app/kpt-tmr/bin/kptTmr /app/kpt-tmr/bin/kptTmr
 
 EXPOSE 8081
-VOLUME /app/kpt-tmr/bin/logs
+VOLUME ["/app/kpt-tmr/bin/logs","/app/kpt-tmr/bin/conf/"]
 
 CMD ["/app/kpt-tmr/bin/kptTmr"]

conf/app-test.ini

@@ -43,7 +43,7 @@ Type = mysql
 User = root
 Password = 123456
 Host = 192.168.1.70:3306
-Name = tmrwatch3
+Name = tmrwatch2
 TablePrefix =
 
 ShowXormlog = false