diff options
| -rw-r--r-- | standalone/src/main/assembly/Dockerfile | 3 | ||||
| -rw-r--r-- | standalone/src/main/assembly/bin/docker-env-config.sh | 38 | ||||
| -rw-r--r-- | standalone/src/main/assembly/bin/run.sh | 1 | ||||
| -rw-r--r-- | standalone/src/main/assembly/resources/bin/initDB.sh | 4 |
4 files changed, 43 insertions, 3 deletions
diff --git a/standalone/src/main/assembly/Dockerfile b/standalone/src/main/assembly/Dockerfile index 0f87b045..30878be3 100644 --- a/standalone/src/main/assembly/Dockerfile +++ b/standalone/src/main/assembly/Dockerfile @@ -49,4 +49,7 @@ RUN mkdir /home/uui WORKDIR /home/uui ADD usecase-ui-server-*-linux64.tar.gz /home/uui/ +RUN bash /home/uui/bin/docker-env-config.sh +USER postgres +WORKDIR /home/uui ENTRYPOINT /home/uui/bin/run.sh diff --git a/standalone/src/main/assembly/bin/docker-env-config.sh b/standalone/src/main/assembly/bin/docker-env-config.sh new file mode 100644 index 00000000..04559ba3 --- /dev/null +++ b/standalone/src/main/assembly/bin/docker-env-config.sh @@ -0,0 +1,38 @@ +#!/bin/bash +# +# 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 + 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 a80b0b01..bb0789b9 100644 --- a/standalone/src/main/assembly/bin/run.sh +++ b/standalone/src/main/assembly/bin/run.sh @@ -24,7 +24,6 @@ sleep 10 echo "usecase-ui database init script start..." dbScript="$main_path/resources/bin/initDB.sh" -chmod 755 $dbScript source $dbScript 127.0.0.1 5432 postgres uui echo "usecase-ui database init script finished normally..." diff --git a/standalone/src/main/assembly/resources/bin/initDB.sh b/standalone/src/main/assembly/resources/bin/initDB.sh index 97e65ad3..cdfa4b5c 100644 --- a/standalone/src/main/assembly/resources/bin/initDB.sh +++ b/standalone/src/main/assembly/resources/bin/initDB.sh @@ -23,9 +23,9 @@ user_pg=$3 user_uui=$4 echo "setting postgres database password" -su - $user_pg <<EOF +#su - $user_pg <<EOF psql --command "alter user $user_pg with password '$user_pg';" -EOF +#EOF echo "start create usecase-ui database..." dbscripts_path="$main_path/resources/dbscripts/postgres" |