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

templates/java/docker-entrypoint.sh

@@ -37,7 +37,7 @@ count=0
 log_exist=0
 log_path="/home/quant_group/logs"
 
-until [[ $count -eq 120 ]] || [[ $log_exist -eq 1 ]]
+until [[ $count -eq 60 ]] || [[ $log_exist -eq 1 ]]
 do
   let count+=1
   echo "count is $count"
@@ -45,13 +45,15 @@ do
   if find "$log_path" -mindepth 1 -print -quit | grep -q .; then
       echo "log is exist!"
 	  log_exist=1
-  else
-	  touch ./logs/error.log
-	  echo "Log is not exist or java server start error." >> ./logs/error.log 
   fi
   sleep 1
 done
 
+if [[ $count -eq 60 ]] && [[ $log_exist -eq 0 ]]; then
+	touch ./logs/error.log
+	echo "Log is not exist or java server start error." >> ./logs/error.log 
+fi
+
 echo "cd /home/qg-xterm/;git pull;cd -"
 cd /home/qg-xterm/;git pull;cd -
 
@@ -59,7 +61,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
+frontail ./logs/*log -n 500 -d
 
-# 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/lua-ui/docker-entrypoint.sh

@@ -25,6 +25,7 @@ done
 
 echo "cd /home/qg-xterm/;git pull;cd -"
 cd /home/qg-xterm/;git pull;cd -
+source ~/.bash_profile
 
 echo "sed xyqb.com to q-gp.com"
 # find ${package_path}/ -name "*.js" | xargs sed -i "s/.xyqb.com/-$NAMESPACE.q-gp.com/g"

templates/nodejs/docker-entrypoint.sh

@@ -18,6 +18,7 @@ sed -i "s#xterm.js demo#${SYSTEM_NAME}@${namespace}#"  /home/qg-xterm/demo/index
 
 echo "rm dist.tgz public/dist -rf"
 rm -rf ${package_path}/dist.tgz
+source ~/.bash_profile
 
 echo "sh start.sh"
 sh start.sh

templates/python/docker-entrypoint.sh

@@ -4,6 +4,7 @@ package_path="/home/quant_group/project"
 
 echo "cd ${package_path}"
 cd ${package_path}
+source ~/.bash_profile
 
 echo "tar zxf dist.tgz  -C ${package_path}"
 tar zxf ${package_path}/dist.tgz  -C ${package_path}/