summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuji7 <lu.ji3@zte.com.cn>2017-09-28 09:15:27 +0800
committerLuji7 <lu.ji3@zte.com.cn>2017-09-28 09:15:32 +0800
commit6fbe31e8e5e49952bcd8292117012d8129959de1 (patch)
tree46ab29720dde4543d8663a21763f5325c74e178b
parentf3024257078722df22a1e4e67181ea9fcf0504b3 (diff)
fix db script fail.
Change-Id: I33efeb7414c1ced244dc7d02ba7a02937ff8e6bd Issue-Id: USECASEUI-36 Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
-rw-r--r--standalone/src/main/assembly/Dockerfile2
-rw-r--r--standalone/src/main/assembly/bin/run.sh4
2 files changed, 5 insertions, 1 deletions
diff --git a/standalone/src/main/assembly/Dockerfile b/standalone/src/main/assembly/Dockerfile
index 1a5ed614..4d5cbe65 100644
--- a/standalone/src/main/assembly/Dockerfile
+++ b/standalone/src/main/assembly/Dockerfile
@@ -43,5 +43,5 @@ ADD usecase-ui-server-*-linux64.tar.gz /home/uui/
#RUN chmod 755 /home/uui/bin/*.sh
-ENTRYPOINT /home/uui/resources/bin/initDB.sh root root 3306 127.0.0.1
+#ENTRYPOINT /home/uui/resources/bin/initDB.sh root root 3306 127.0.0.1
ENTRYPOINT /home/uui/bin/run.sh
diff --git a/standalone/src/main/assembly/bin/run.sh b/standalone/src/main/assembly/bin/run.sh
index cccbb8e1..9ef6e07a 100644
--- a/standalone/src/main/assembly/bin/run.sh
+++ b/standalone/src/main/assembly/bin/run.sh
@@ -23,6 +23,10 @@ echo "Starting mysql"
service mysql start
sleep 1
+SCRIPT="/home/uui/resources/bin/initDB.sh"
+chmod 755 "$SCRIPT"
+"$SCRIPT" root root 3306 127.0.0.1
+
echo @JAVA_HOME@ $JAVA_HOME
JAVA="$JAVA_HOME/bin/java"
echo @JAVA@ $JAVA