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

templates/java/Dockerfile

@@ -9,15 +9,13 @@ 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}, CLUSTER: ${CLUSTER}" >> ./build_info
+RUN echo "BUILD_TIME: ${BUILD_TIME} ,BUILD_NUMBER: ${BUILD_NUMBER},SYSTEM_NAME: ${SYSTEM_NAME},BRANCH_NAME: ${BRANCH_NAME}" >> ./build_info
 
 COPY docker-entrypoint.sh .
 COPY ./*.jar /home/quant_group/project/app.jar

templates/java/docker-entrypoint.sh

@@ -29,7 +29,7 @@ if [[ $CLUSTER == "pro" ]]; then
 	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 &
 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} >/dev/null 2>&1 &
+	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
 
 # waiting for log