3 files changed, 16 insertions, 9 deletions
diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index 4b04e22cf..a115b5f02 100755
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -26,8 +26,7 @@ ENV LOG4J_LOGLEVEL INFO
 ENV LOG4J_APPENDER rollingfile
 ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs
 
-ENV VID_AAI_HOST aai.api.simpledemo.onap.org
-ENV VID_AAI_PORT 8443
+ENV VID_AAI_URL https://aai.api.simpledemo.onap.org:8443
 ENV VID_APP_DISPLAY_NAME VID
 ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context
 ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra
diff --git a/deliveries/src/main/docker/docker-files/docker-compose.yml b/deliveries/src/main/docker/docker-files/docker-compose.yml
index 644590191..eedf7322e 100755
--- a/deliveries/src/main/docker/docker-files/docker-compose.yml
+++ b/deliveries/src/main/docker/docker-files/docker-compose.yml
@@ -1,15 +1,21 @@
-version: '3.1'
+version: '3.2'
+
+# Please note this configuration is provided for local development. Do not use it on production.
 
 services:
     vid-server:
-        image: nexus3.onap.org:10001/onap/vid
+        image: onap/vid:latest
         ports:
             - "8080:8080"
-        links:
-            - vid-mariadb:vid-mariadb-docker-instance
         environment:
             VID_MYSQL_DBNAME: vid_openecomp_epsdk
             VID_MYSQL_PASS: YOUR_PASSWORD
+            VID_MYSQL_HOST: vid-mariadb
+            ASDC_CLIENT_REST_PROTOCOL: http
+            ASDC_CLIENT_REST_HOST: vid-simulator
+            ASDC_CLIENT_REST_PORT: 1080
+            VID_AAI_URL: http://vid-simulator:1080
+            VID_MSO_SERVER_URL: http://vid-simulator:1080
 
     vid-mariadb:
         image: mariadb:10
@@ -22,4 +28,7 @@ services:
             MYSQL_DATABASE: vid_openecomp_epsdk
             MYSQL_USER: vidadmin
             MYSQL_PASSWORD: YOUR_PASSWORD
-            MYSQL_ROOT_PASSWORD: ROOT_PASSWORD
-\ No newline at end of file
+            MYSQL_ROOT_PASSWORD: ROOT_PASSWORD
+
+    vid-simulator:
+        image: onap/vid-simulator:latest
+\ No newline at end of file
diff --git a/deliveries/src/main/scripts/localize_system.sh b/deliveries/src/main/scripts/localize_system.sh
index 0947d49ea..a7e6cd3ba 100755
--- a/deliveries/src/main/scripts/localize_system.sh
+++ b/deliveries/src/main/scripts/localize_system.sh
@@ -13,8 +13,7 @@ sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \
 	-e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \
 	-e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \
 	-e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \
-	-e 's/${VID_AAI_HOST}/'${VID_AAI_HOST}'/g' \
-	-e 's/${VID_AAI_PORT}/'${VID_AAI_PORT}'/g' \
+	-e 's ${VID_AAI_URL} '${VID_AAI_URL}' g' \
 	-e 's/${AAI_USE_CLIENT_CERT}/'${AAI_USE_CLIENT_CERT}'/g' \
 	-e 's/${AAI_VID_UID}/'${AAI_VID_UID}'/g' \
 	-e 's/${AAI_VID_PASSWD_X}/'${AAI_VID_PASSWD_X}'/g' \