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

baseimg/tools/rabbit_mq/scripts/docker-entrypoint.sh

 #!/bin/bash
 
+
 if [[ -e /.firstrun ]]; then
     /scripts/init_script.sh
 fi
@@ -8,24 +9,52 @@ cd /home/quant_group/rabbitmq
 touch nohup.out
 
 echo "Starting RabbitMQ..."
+> /tmp/rabbitmq.out
 nohup /usr/sbin/rabbitmq-server > /tmp/rabbitmq.out &
 
-count=1
 
-until [[ $count -eq 300 ]] || [[ $is_running -eq 1 ]]
+export NAMESPACE=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
+
+count=1
+is_running=0
+until [[ is_running -eq 1 ]]
 do
-  let count+=1
-  echo "count is $count"
-  curl -X GET -H "Authorization: Basic cWE6cWF0ZXN0" "http://localhost:15672/api/definitions"
-  
-  if [ $? -eq 0 ]
-    then
-	  echo "rabbitmq is running rabbitmq-plugins enable rabbitmq_delayed_message_exchange"
-	  rabbitmq-plugins enable rabbitmq_delayed_message_exchange
-	  
-	  tail -f /tmp/rabbitmq.out
-    else
-      echo "rabbitmq is not running"
-      sleep 1
-  fi
-done
\ No newline at end of file
+	echo "wait rabbitmq start flag"
+	num=`grep -n -E 'Server startup complete' /tmp/rabbitmq.out |cut -d ":" -f 1`
+	echo "----$num"
+	if [ -n "$num" ];then
+		is_running=1
+		break
+	fi
+	sleep 10
+done
+
+echo "wait 5s"
+sleep 5
+
+rabbitmq-plugins enable rabbitmq_delayed_message_exchange
+
+
+curl --request POST \
+  --url http://192.168.6.13/api/etcd/set_env_job_status \
+  --header 'Content-Type: application/json' \
+  --data "{\"namespace\": \"$NAMESPACE\",\"job_name\": \"rabbitmq_sync\",\"status\": \"pending\"}"
+
+
+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
+
+
+curl --request POST \
+  --url http://192.168.6.13/api/etcd/set_env_job_status \
+  --header 'Content-Type: application/json' \
+  --data "{\"namespace\": \"$NAMESPACE\",\"job_name\": \"rabbitmq_sync\",\"status\": \"done\"}"
+
+
+tail -f /tmp/rabbitmq.out
+
+
+
+
+
+

templates/java/Dockerfile

@@ -23,6 +23,7 @@ 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/
 RUN chmod +x ./docker-entrypoint.sh
 
 CMD ./docker-entrypoint.sh
\ No newline at end of file

templates/java/docker-entrypoint.sh

@@ -6,6 +6,10 @@ config_path="`pwd`/${module_name}/application.properties"
 
 export NAMESPACE=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
 echo "NAMESPACE is $NAMESPACE"
+
+echo 192.168.6.13 eos.quantgroups.com >> /etc/hosts
+echo 192.168.4.117 apollo-dev.quantgroups.com >> /etc/hosts
+
 sed -i "s#.xyqb.com#-$NAMESPACE.q-gp.com#g" ${config_path}
 sed -i "s#.domain.com#-$NAMESPACE.q-gp.com#g" ${config_path}
 sed -i "s#.quantgroup.cn#-$NAMESPACE.q-gp.com#g" ${config_path}
@@ -41,6 +45,7 @@ do
 	  log_exist=1
   else
       echo "log is not exist! waiting for server start."
+	  touch ./logs/tmp.log
   fi
   sleep 1
 done
@@ -52,7 +57,7 @@ echo "node /home/qg-xterm/demo/app.js"
 nohup node /home/qg-xterm/demo/app.js &
 
 echo "frontail ./logs/*log -n 500 -d "
-frontail ./logs/*log -n 500 -d 
+frontail ./logs/*log -n 500
 
-echo "tail -f ./logs/*log"
-tail -f ./logs/*log
\ No newline at end of file
+# echo "tail -f ./logs/*log"
+# tail -f ./logs/*log
\ No newline at end of file

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

templates/tools/eos/Dockerfile

-FROM 192.168.4.36/baseimg/python:201802091706
+FROM 192.168.4.36/baseimg/python:20180328
 
 USER root