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

templates/java/docker-entrypoint.sh

@@ -9,6 +9,7 @@ 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
+source ~/.bash_profile
 
 sed -i "s#.xyqb.com#-$NAMESPACE.q-gp.com#g" ${config_path}
 sed -i "s#.domain.com#-$NAMESPACE.q-gp.com#g" ${config_path}

templates/lua-ui/Dockerfile

-FROM 192.168.4.36/baseimg/openresty:12251535
+FROM 192.168.4.36/baseimg/openresty:201803291115
 
 USER root
 WORKDIR /home/quant_group

templates/nodejs/Dockerfile

-FROM 192.168.4.36/baseimg/nodejs:12251535
+FROM 192.168.4.36/baseimg/nodejs:201803291115
 
 USER root
 WORKDIR /home/quant_group