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

tke/java.sh

@@ -12,13 +12,23 @@ package_path="${module_path}/app.jar"
 config_path="${module_path}/application.properties"
 log_path="/home/quant_group/logs"
 
-echo 192.168.4.50 eos.quantgroups.com >> /etc/hosts
-if [[ $CLUSTER == 'qke' ]]; then
-  echo 172.30.3.209 apollo-dev.quantgroups.com >> /etc/hosts
-else
-  echo 172.17.1.7 apollo-dev.quantgroups.com >> /etc/hosts
-fi
-echo 172.20.3.11 sentry.quantgroups.com >> /etc/hosts
+#echo 192.168.4.50 eos.quantgroups.com >> /etc/hosts
+#if [[ $CLUSTER == 'qke' ]]; then
+#  echo 172.30.3.209 apollo-dev.quantgroups.com >> /etc/hosts
+#else
+#  echo 172.17.1.7 apollo-dev.quantgroups.com >> /etc/hosts
+#fi
+#echo 172.20.3.11 sentry.quantgroups.com >> /etc/hosts
+
+OLD_IFS="$IFS"
+IFS="&"
+array=($HOSTS)
+IFS="$OLD_IFS"
+
+for var in ${array[@]}
+do
+   echo $var|sed "s#=># #g" >> /etc/hosts
+done
 
 # echo 172.30.3.206 apollo-dev.quantgroups.com >> /etc/hosts
 # echo 172.20.3.11 sentry.quantgroups.com >> /etc/hosts

tke/nodejs.sh

@@ -9,14 +9,28 @@ cd ${package_path}
 
 
 echo "echo host"
+
+OLD_IFS="$IFS"
+IFS="&"
+array=($HOSTS)
+IFS="$OLD_IFS"
+
+for var in ${array[@]}
+do
+   echo $var|sed "s#=># #g" >> /etc/hosts
+done
+
+
 echo 192.168.4.50 eos.quantgroups.com >> /etc/hosts
 
-# qke直连apollo服务
-if [[ $CLUSTER == 'qke' ]]; then
-  echo 172.30.3.208 apollo-dev.quantgroups.com >> /etc/hosts
-else
-  echo 172.17.1.7 apollo-dev.quantgroups.com >> /etc/hosts
-fi 
+# qke直连apollo服务 begin
+#if [[ $CLUSTER == 'qke' ]]; then
+#  echo 172.30.3.208 apollo-dev.quantgroups.com >> /etc/hosts
+#else
+#  echo 172.17.1.7 apollo-dev.quantgroups.com >> /etc/hosts
+#fi
+# end
+
 # echo 172.20.3.11 sentry.quantgroups.com >> /etc/hosts
 
 echo "tar zxf dist.tgz  -C ${package_path}"
@@ -43,4 +57,4 @@ if [[ $DEBUG == 1 ]]; then
 	tail -f ~/.bashrc
 fi
 
-echo done!!!
\ No newline at end of file
+echo done!!!