| commit | 652b41c3c7bae3494c6dfc8ada27452da9443f84 | [log] [tgz] |
|---|---|---|
| author | Avinash S <avinash.s@huawei.com> | Wed May 02 11:30:52 2018 +0000 |
| committer | Gerrit Code Review <gerrit@onap.org> | Wed May 02 11:30:52 2018 +0000 |
| tree | e232d085a4fe0fc90d7702ed7f7907c3d9224f90 | |
| parent | a98bd2efb380606ed749c17544ea0be34950dac2 [diff] | |
| parent | 08e2fef7a5b108828f7ab02c8f4661708f10a422 [diff] |
Merge "fix vnfsdk containers for oom"
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh index df6cfce..c794120 100755 --- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh +++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh
@@ -23,8 +23,8 @@ if [ -z "$SERVICE_IP" ]; then export SERVICE_IP=`hostname -i` fi -if [ -z "$POSTGRES_IP" ]; then - export POSTGRES_IP=127.0.0.1 +if [ -z "$POSTGRES_SERVICE_HOST" ]; then + export POSTGRES_SERVICE_HOST=127.0.0.1 fi echo
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh index 697eade..a93e3f5 100755 --- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh +++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh
@@ -17,5 +17,5 @@ #Set postgres instance IP -sed -i 's|127.0.0.1|'"$POSTGRES_IP"'|' webapps/ROOT/WEB-INF/classes/mybatis/configuration/configuration.xml +sed -i 's|127.0.0.1|'"$POSTGRES_SERVICE_HOST"'|' webapps/ROOT/WEB-INF/classes/mybatis/configuration/configuration.xml
diff --git a/vnfmarket-be/deployment/install/docker-compose.yml b/vnfmarket-be/deployment/install/docker-compose.yml index db6207d..b9c5542 100644 --- a/vnfmarket-be/deployment/install/docker-compose.yml +++ b/vnfmarket-be/deployment/install/docker-compose.yml
@@ -25,7 +25,7 @@ - "8702-8703:8702-8703" - "8000:8000" environment: - POSTGRES_IP: postgres + POSTGRES_SERVICE_HOST: postgres JPDA_ADDRESS: 8000 JPDA_TRANSPORT: dt_socket volumes: