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

baseimg/oracle_jdk8/Dockerfile

@@ -11,4 +11,9 @@ ENV PATH $PATH:$JAVA_HOME/bin
 # 为了减小生成的镜像的体积，删除包和jdk源码
 RUN rm -rf jdk-8u144-linux-x64.tar.gz ./jdk1.8.0_144/src.zip
 
+# 安装日志组件
+RUN curl -sL https://rpm.nodesource.com/setup_8.x | bash -
+RUN yum install -y nodejs
+RUN yum install -y git
+
 RUN alias "la=ls -al"
\ No newline at end of file

templates/java/Dockerfile

@@ -6,6 +6,9 @@ USER root
 
 ARG BUILD_NUMBER
 
+#安装日志插件
+RUN npm i frontail -g --registry=https://registry.npm.taobao.org
+
 WORKDIR /home/quant_group
 RUN mkdir project/
 RUN mkdir logs/

templates/java/docker-entrypoint.sh

@@ -11,5 +11,8 @@ sed -i "s/.xyqb.com/-$namespace.q-gp.com/g" ${config_path}
 echo "java -Xmx512m -XX:PermSize64m -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 -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path}"
 java -Xmx512m -XX:PermSize64m -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 -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path}
 
-# echo "java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80"
-# java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80
+echo "frontail logs/baitiao.log -d -n 100"
+frontail logs/baitiao.log -d -n 100
\ No newline at end of file
+
+echo "tail -f ./logs/*.log"
+tail -f ./logs/*.log
\ No newline at end of file