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

baseimg/tools/db/init_db_data.sh

@@ -20,7 +20,7 @@ done
 
 
 export NAMESPACE=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
-echo "cd $WORK_PATH"
-cd $WORK_PATH
+echo "cd /docker-entrypoint-initdb.d"
+cd /docker-entrypoint-initdb.d
 echo "replace DB string"
 sh replace.sh 127.0.0.1 3306 qa qatest true $NAMESPACE
\ No newline at end of file

baseimg/tools/db/replace.sh

@@ -13,7 +13,12 @@ NAMESPACE=$6
 # NAMESPACE=tianyawei
 
 DB_FILE=dump.sql
-
+echo "HOST=$1
+PORT=$2
+USER=$3
+PASSWORD=$4
+HTTPS=$5
+NAMESPACE=$6"
 EXCLUDED_TABLES=(
 clotho.JOB_EXECUTION_LOG
 clotho.JOB_STATUS_TRACE_LOG
@@ -59,5 +64,5 @@ else
 fi
 
 echo "mysql dump file"
-mysql --host=${HOST} --${PORT}  --user=${USER} --password=${PASSWORD} < ${DB_FILE}
+mysql --host=${HOST} --port=${PORT}  --user=${USER} --password=${PASSWORD} < ${DB_FILE}