Merge branch 'master' of http://git.quantgroup.cn/QA/qg-dockerfiles

templates/java/Dockerfile

@@ -13,8 +13,7 @@ RUN echo -e "${BUILD_SCHEMA//@/\n}" >> ./build_info
 COPY docker-entrypoint.sh .
 COPY ./*.jar /home/quant_group/project/app.jar
 COPY ./application.properties /home/quant_group/project/application.properties
-COPY ./server.properties /opt/settings/
-# COPY ./*.xml /home/quant_group/project/
+# COPY ./server.properties /opt/settings/
 RUN chmod +x ./docker-entrypoint.sh
 
 CMD ./docker-entrypoint.sh
\ No newline at end of file

templates/java/docker-entrypoint.sh

@@ -19,17 +19,10 @@ sed -i "s#.quantgroup.cn#-$NAMESPACE.q-gp.com#g" ${config_path}
 sed -i "s#xterm.js demo#${SYSTEM_NAME}@${NAMESPACE}#"  /home/qg-xterm/demo/index.html
 
 
-if [[ $CLUSTER == "pro" ]]; then
-	#初始化变量
-	export DB_SERVICE_HOST="192.168.4.15"
-	export RABBIT_SERVICE_HOST="192.168.4.15"
-	export REDIS_SERVICE_HOST="192.168.4.15"
-	export ZOOKEEPER_SERVICE_HOST="192.168.4.15"
-	
-	echo "nohup java -Xmx512m  -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Denv=pro -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} & " > java_command
-	nohup java -Xmx512m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Denv=pro -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} >/dev/null 2>&1 &
+if [[ $CLUSTER == "3B" ]]; then	
+	nohup java -Xmx512m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Denv=pro -Didc=k8s3b -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} >/dev/null 2>&1 &
 else
-	echo "nohup java -Xmx512m  -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Denv=dev -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} & " > java_command
+	echo "java -Xmx512m  -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Denv=dev -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} & " > java_command
 	nohup java -Xmx512m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Denv=dev -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} >/dev/null 2>&1 &
 fi
 

templates/java/logback-dev.xml

-<?xml version="1.0" encoding="UTF-8" ?>
-<configuration>
-    <springProperty name="spring.application.name" source="spring.application.name"/>
-    <property name="LOG_LEVEL_PATTERN" value="%clr(%5p) %clr([${spring.application.name:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]){yellow}"/>
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%10.10t]){faint} [%40.40file:%4.4line] %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-    <!-- 这里面定义了 CONSOLE_LOG_PATTERN, FILE_LOG_PATTERN 等日志格式, 还定义了一些日志级别 -->
-    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
-    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
-
-    <logger name="cn.quantgroup" level="DEBUG" />
-    <logger name="org.springframework" level="INFO" />
-    <!--<logger name="java.sql.Connection" level="DEBUG"/>-->
-    <!--<logger name="java.sql.Statement" level="DEBUG"/>-->
-    <!--<logger name="java.sql.PreparedStatement" level="DEBUG"/>-->
-    <logger name="org.hibernate" level="warn"/>
-    <logger name="org.apache" level="warn"/>
-    <logger name="ch.qos.logback" level="warn"/>
-
-    <root level="INFO">
-        <appender-ref ref="CONSOLE" />
-    </root>
-
-</configuration>
\ No newline at end of file

templates/java/logback-pro.xml

-<?xml version="1.0" encoding="UTF-8" ?>
-<configuration>
-    <springProperty name="spring.application.name" source="spring.application.name"/>
-    <property name="LOG_LEVEL_PATTERN" value="%5p [${spring.application.name:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]"/>
-    <property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} --- [%thread] [%file:%line] %logger - %msg%n}"/>
-
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/home/quant_group/logs/${spring.application.name:-application}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/home/quant_group/logs/${spring.application.name:-application}.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${FILE_LOG_PATTERN}</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.springframework" level="warn"/>
-    <logger name="org.hibernate" level="warn"/>
-    <logger name="org.apache" level="warn"/>
-    <logger name="ch.qos.logback" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="FILE"/>
-    </root>
-
-</configuration>
\ No newline at end of file