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

90ced6c6 · wentao.suo · 8e5a796f · 49615ea4 · 90ced6c6 · 90ced6c6
Commit 90ced6c6 authored Mar 28, 2018 by wentao.suo
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

docker-entrypoint.sh templates/java/docker-entrypoint.sh +1 -0

Dockerfile templates/tools/eos/Dockerfile +1 -1

No files found.
--- a/templates/java/docker-entrypoint.sh
+++ b/templates/java/docker-entrypoint.sh
@@ -41,6 +41,7 @@ do
 	  log_exist=1
  else
      echo "log is not exist! waiting for server start."
+	  touch ./logs/tmp.log
  fi
  sleep 1
 done

--- a/templates/tools/eos/Dockerfile
+++ b/templates/tools/eos/Dockerfile
-FROM 192.168.4.36/baseimg/python:201802091706
+FROM 192.168.4.36/baseimg/python:20180328

 USER root