增加cluster参数，用于区分生产镜像和测试开发镜像

templates/java/Dockerfile

@@ -9,14 +9,15 @@ ARG BUILD_NUMBER
 ARG SYSTEM_NAME  
 ARG BRANCH_NAME
 ARG BUILD_TIME
-
+ARG CLUSTER
 
 ENV BUILD_NUMBER=$BUILD_NUMBER
 ENV SYSTEM_NAME=$SYSTEM_NAME
 ENV BRANCH_NAME=$BRANCH_NAME
 ENV BUILD_TIME=$BUILD_TIME
+ENV CLUSTER=$CLUSTER
 
-RUN echo "BUILD_TIME: ${BUILD_TIME} ,BUILD_NUMBER: ${BUILD_NUMBER},SYSTEM_NAME: ${SYSTEM_NAME},BRANCH_NAME: ${BRANCH_NAME}" >> ./build_info
+RUN echo "BUILD_TIME: ${BUILD_TIME} ,BUILD_NUMBER: ${BUILD_NUMBER},SYSTEM_NAME: ${SYSTEM_NAME},BRANCH_NAME: ${BRANCH_NAME}, CLUSTER: ${CLUSTER}" >> ./build_info
 
 COPY docker-entrypoint.sh .
 COPY ./*.jar /home/quant_group/project/app.jar

templates/java/docker-entrypoint.sh

@@ -13,10 +13,20 @@ 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
 
 
-#echo "nohup java -Xmx512m -XX:PermSize64m -XX:MaxMetaspaceSize=128m -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
+if $CLUSTER eq "pro"; then
+	#初始化变量
+	export db="192.168.4.72"
+	#export rabbitmq=“192.168.4.72”
+	#export redis="192.168.4.72"
+	#export zookeeper="192.168.4.72"
+	
+	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
+	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} &
+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
+	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} &
+fi
 
-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
-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} &
 
 echo "sleep 10"
 sleep 10