Merge "change application.properties $ standalone for separate postgres"

2 files changed, 1 insertions, 49 deletions

diff --git a/standalone/src/main/assembly/bin/docker-env-config.sh b/standalone/src/main/assembly/bin/docker-env-config.sh
deleted file mode 100644
index 8e583b10..00000000
--- a/standalone/src/main/assembly/bin/docker-env-config.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2020 CMCC Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-main_path="/home/uui"
-
-add_user() {
-  #useradd postgres
-  echo "add_user postgres..."
-  chown -R postgres:postgres $main_path
-}
-
-modify_owner() {
-  dbScript="$main_path/resources/bin/initDB.sh"
-  chmod 755 $dbScript
-  chown -R postgres:postgres /var/run/postgresql
-  chown -R postgres:postgres $PG_HOME
-  chown -R postgres:postgres $PG_VAR_LIB
-  chown -R postgres:postgres $PG_USR_LIB
-  chown -R postgres:postgres $PG_LOGDIR
-  chmod -R 0700 $PG_HOME
-  echo "modify files owner..."
-}
-
-add_user
-modify_owner
diff --git a/standalone/src/main/assembly/bin/run.sh b/standalone/src/main/assembly/bin/run.sh
index 42249fa4..faa079ef 100644
--- a/standalone/src/main/assembly/bin/run.sh
+++ b/standalone/src/main/assembly/bin/run.sh
@@ -18,15 +18,6 @@
 main_path="/home/uui"
 echo @main_path@ $main_path
 
-echo "Starting postgreSQL..."
-#service postgresql start
-postmaster -D /usr/share/postgresql/data &
-sleep 10
-
-echo "usecase-ui database init script start..."
-dbScript="$main_path/resources/bin/initDB.sh"
-source $dbScript 127.0.0.1 5432 postgres uui
-echo "usecase-ui database init script finished normally..."
 
 JAVA_PATH="$JAVA_HOME/bin/java"
 JAVA_OPTS="-Xms50m -Xmx128m"
@@ -37,4 +28,4 @@ jar_path="$main_path/usecase-ui-server.jar"
 echo @jar_path@ $jar_path
 
 echo "Starting usecase-ui-server..."
-$JAVA_PATH $JAVA_OPTS -classpath $jar_path -jar $jar_path
+$JAVA_PATH $JAVA_OPTS -classpath $jar_path -jar $jar_path $SPRING_OPTS