summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xvnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh4
-rwxr-xr-xvnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh2
-rw-r--r--vnfmarket-be/deployment/install/docker-compose.yml2
3 files changed, 4 insertions, 4 deletions
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 df6cfce9..c7941209 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 697eaded..a93e3f54 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 00e26fb0..efffebf9 100644
--- 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: