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

templates/java/Dockerfile

@@ -2,17 +2,21 @@ FROM 192.168.4.36/baseimg/jdk8:12251535
 
 USER root
 WORKDIR /home/quant_group
+
 RUN mkdir project/;mkdir logs/;mkdir project/config/;mkdir -p /opt/settings/
 
 ARG BUILD_NUMBER
 ARG SYSTEM_NAME  
 ARG BRANCH_NAME
+ARG BUILD_TIME
+
 
 ENV BUILD_NUMBER=$BUILD_NUMBER
 ENV SYSTEM_NAME=$SYSTEM_NAME
 ENV BRANCH_NAME=$BRANCH_NAME
+ENV BUILD_TIME=$BUILD_TIME
 
-RUN echo "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}" >> ./build_info
 
 COPY docker-entrypoint.sh .
 COPY ./*.jar /home/quant_group/project/app.jar

templates/java/docker-entrypoint.sh

@@ -6,13 +6,16 @@ config_path="`pwd`/${module_name}/application.properties"
 
 export NAMESPACE=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
 echo "NAMESPACE is $NAMESPACE"
-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#.xyqb.com#-$NAMESPACE.q-gp.com#g" ${config_path}
+sed -i "s#.domain.com#-$NAMESPACE.q-gp.com#g" ${config_path}
 
-sed -i "s/xterm.js demo/${SYSTEM_NAME}@${NAMESPACE}/"  /home/qg-xterm/demo/index.html
+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
-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} &
+
+#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
+
+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

templates/lua-ui/Dockerfile

@@ -9,12 +9,14 @@ ENV NODE_ENV=test
 ARG BUILD_NUMBER 
 ARG SYSTEM_NAME  
 ARG BRANCH_NAME
+ARG BUILD_TIME
 
 ENV BUILD_NUMBER=$BUILD_NUMBER
 ENV SYSTEM_NAME=$SYSTEM_NAME
 ENV BRANCH_NAME=$BRANCH_NAME
+ENV BUILD_TIME=$BUILD_TIME
 
-RUN echo "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}" >> ./build_info
 
 COPY nginx.conf /usr/local/openresty/nginx/conf/nginx.conf
 COPY *.vh.conf /usr/local/openresty/nginx/conf/conf.d/

templates/lua-ui/docker-entrypoint.sh

@@ -28,7 +28,7 @@ cd /home/qg-xterm/;git pull;cd -
 
 echo "sed xyqb.com to q-gp.com"
 # find ${package_path}/ -name "*.js" | xargs sed -i "s/.xyqb.com/-$NAMESPACE.q-gp.com/g"
-find ${package_path}/ -name "*.js" | xargs sed -i "s/.domain.com/-$NAMESPACE.q-gp.com/g"
+find ${package_path}/ -name "*.js" | xargs sed -i "s#.domain.com#-$NAMESPACE.q-gp.com#g"
 
 sed -i "s/xterm.js demo/${SYSTEM_NAME}@${NAMESPACE}/"  /home/qg-xterm/demo/index.html
 

templates/nodejs/Dockerfile

@@ -8,12 +8,14 @@ ENV NODE_ENV=test
 ARG BUILD_NUMBER 
 ARG SYSTEM_NAME  
 ARG BRANCH_NAME
+ARG BUILD_TIME
 
 ENV BUILD_NUMBER=$BUILD_NUMBER
 ENV SYSTEM_NAME=$SYSTEM_NAME
 ENV BRANCH_NAME=$BRANCH_NAME
+ENV BUILD_TIME=$BUILD_TIME
 
-RUN echo "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}" >> ./build_info
 
 COPY docker-entrypoint.sh .
 COPY *.tgz ./project/dist.tgz

templates/nodejs/docker-entrypoint.sh

@@ -12,9 +12,9 @@ echo "sed sed xyqb.com to q-gp.com"
 namespace=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
 echo "namespace is $namespace"
 # find ${package_path}/ -type f -name "*.js" | xargs sed -i "s/.xyqb.com/-$namespace.q-gp.com/g"
-find ${package_path}/ -type f -name "*.js" | xargs sed -i "s/.domain.com/-$namespace.q-gp.com/g"
+find ${package_path}/ -type f -name "*.js" | xargs sed -i "s#.domain.com#-$namespace.q-gp.com#g"
 
-sed -i "s/xterm.js demo/${SYSTEM_NAME}@${namespace}/"  /home/qg-xterm/demo/index.html
+sed -i "s#xterm.js demo#${SYSTEM_NAME}@${namespace}#"  /home/qg-xterm/demo/index.html
 
 echo "rm dist.tgz public/dist -rf"
 rm -rf ${package_path}/dist.tgz

templates/python/Dockerfile

 FROM 192.168.4.36/baseimg/python
+MAINTAINER kalvin "dekun.dai@quantgroup.cn"
+
+ARG BUILD_NUMBER
+ARG SYSTEM_NAME
+ARG BUILD_TIME
 
 USER root
 WORKDIR /home/quant_group