fix vnfsdk containers for oom

Change POSTGRES_IP to POSTGRES_SERVICE_HOST in vnfsdk refrepo container.

Issue-ID: VNFSDK-260

Change-Id: I90de6dcc34f651c6d86bbe5cae50e504d555a9e1
Signed-off-by: Chris Donley <christopher.donley@huawei.com>

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 (executable)
--- 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 (executable)
--- 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 00e26fb..efffebf 100644 (file)
--- a/vnfmarket-be/deployment/install/docker-compose.yml
+++ b/vnfmarket-be/deployment/install/docker-compose.yml
@@ -23,7 +23,7 @@ services:
             - "8702-8703:8702-8703"
             - "8000:8000"
         environment:
-            POSTGRES_IP: postgres
+            POSTGRES_SERVICE_HOST: postgres
             JPDA_ADDRESS: 8000
             JPDA_TRANSPORT: dt_socket
         volumes: