diff options
| author |   tang peng <tang.peng5@zte.com.cn> | 2018-07-24 08:09:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-24 08:09:41 +0000 |
| commit | 5cda27796aec073b78b2157d4df15a3926c8ba37 (patch) | |
| tree | e9210a6e2d334208bb5d415f7fb0e3e4e063bbf6 /rulemgt-standalone/src/main/assembly/bin | |
| parent | ca3da05a6780e130bc10c26d75ced2917195bf85 (diff) | |
| parent | bcb49748e807943be84baece5d5109f75bacc45c (diff) | |
Merge "replace the base image with alpine"
Diffstat (limited to 'rulemgt-standalone/src/main/assembly/bin')
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/bin/initDB.sh | 4 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/bin/run.sh | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/rulemgt-standalone/src/main/assembly/bin/initDB.sh b/rulemgt-standalone/src/main/assembly/bin/initDB.sh index b52b228..82fbea6 100644 --- a/rulemgt-standalone/src/main/assembly/bin/initDB.sh +++ b/rulemgt-standalone/src/main/assembly/bin/initDB.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Copyright 2017 ZTE Corporation. # @@ -40,7 +40,7 @@ psql -U $user -p $port -h $host -d $dbname -f $main_path/dbscripts/postgresql/on psql -U $user -p $port -h $host -d $dbname --command 'select * from aplus_rule;' sql_result=$? unset PGPASSWORD -cat "sql_result="$sql_result +echo "sql_result=$sql_result" if [ $sql_result != 0 ] ; then echo "failed to init rulemgt database!" exit 1 diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh index c8bae4c..fb7c164 100644 --- a/rulemgt-standalone/src/main/assembly/bin/run.sh +++ b/rulemgt-standalone/src/main/assembly/bin/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Copyright 2017 ZTE Corporation. @@ -25,8 +25,8 @@ JAVA="$JAVA_HOME/bin/java" echo @JAVA@ $JAVA main_path=$RUNHOME/.. cd $main_path -JAVA_OPTS="-Xms50m -Xmx128m -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=9201" -port=8312 +JAVA_OPTS="-Xms50m -Xmx128m" +port=9201 #JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n" echo @JAVA_OPTS@ $JAVA_OPTS @@ -80,7 +80,10 @@ sed -i "s|keyStorePassword:.*|keyStorePassword: $KEY_PASSWORD|" "$main_path/conf ./bin/initDB.sh $JDBC_USERNAME $JDBC_PASSWORD $DB_NAME $DB_PORT "${URL_JDBC%:*}" -#Start nginx -nginx -c /usr/local/nginx/conf/holmes.nginx.conf + +#Register the frontend to MSB + + +nginx -c /usr/local/openresty/nginx/conf/nginx.conf "$JAVA" $JAVA_OPTS -classpath "$class_path" org.onap.holmes.rulemgt.RuleActiveApp server "$main_path/conf/rulemgt.yml" |