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

baseimg/common/python/requirements.txt

+requests
 PyYAML
 flask
 flask-restful
+Flask-APScheduler
 python-jenkins
 kubernetes
 python-etcd
-logzero
\ No newline at end of file
+logzero
+qingcloud-sdk
+harbor-py
+simplejson
\ No newline at end of file

job/rabbitmq-sync/docker-entrypoint.sh

@@ -30,13 +30,13 @@ done
 if [[ $is_running -eq 1 ]]
   then  
     echo "rabbitmq is running!!! start execution sync job"
-		echo "init rabbit with eos server"
-		# echo "get definitions from 172.16.1.231"
-		# response=$(curl -X GET -H "Authorization: Basic cmFiYml0X2FkbWluOmFiYzEyMzQ=" "http://172.16.1.231:15672/api/definitions")
-		# curl -X POST -H "Content-Type: application/json" -H "Authorization: Basic cWE6cWF0ZXN0" -d $response "http://rabbitmq:15672/api/definitions"
-		response=$(curl -X POST -H "Content-Type: application/json" -d "{\"namespace\":\"$NAMESPACE\"}" "http://eos.quantgroups.com/api/etcd/init_env_rabbitmq_config")
+	echo "init rabbit with eos server"
+	# echo "get definitions from 172.16.1.231"
+	# response=$(curl -X GET -H "Authorization: Basic cmFiYml0X2FkbWluOmFiYzEyMzQ=" "http://172.16.1.231:15672/api/definitions")
+	# curl -X POST -H "Content-Type: application/json" -H "Authorization: Basic cWE6cWF0ZXN0" -d $response "http://rabbitmq:15672/api/definitions"
+	response=$(curl -X POST -H "Content-Type: application/json" -d "{\"namespace\":\"$NAMESPACE\"}" "http://192.168.6.13/api/etcd/init_env_rabbitmq_config")
   	echo $response
-	else
+  else
     echo "rabbitmq is not running!!! Do not execution sync job"
 fi
 

templates/java/docker-entrypoint.sh

@@ -24,7 +24,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 -Denv=dev -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} >./logs/project.log 2>&1 &
 fi
 
 # waiting for log