Fix portal properties file

[aai/test-config.git] / docker-compose-app.yml

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index 4ba5b4c..778d727 100644 (file)
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -9,6 +9,7 @@ services:
       - CHEF_BRANCH=master
       - CHEF_GIT_URL=http://gerrit.onap.org/r/aai
       - AAI_CORE_VERSION=1.1.0-SNAPSHOT
+      - LOCAL_USER_ID=${USER_ID}
     ports:
       - 8447:8447
     volumes:
@@ -27,6 +28,7 @@ services:
       - CHEF_BRANCH=master
       - CHEF_GIT_URL=http://gerrit.onap.org/r/aai
       - AAI_CORE_VERSION=1.1.0-SNAPSHOT
+      - LOCAL_USER_ID=${USER_ID}
     volumes:
       - ${TRAVERSAL_LOGS}:/opt/aai/logroot/AAI-GQ
     ports:
@@ -37,7 +39,7 @@ services:
         max-size: "30m"
         max-file: "5"
   aai.api.simpledemo.openecomp.org:
-    image: ${AAI_HAPROXY_IMAGE}
+    image: ${AAI_HAPROXY_IMAGE}:${AAI_HAPROXY_VERSION}
     hostname: aai.api.simpledemo.openecomp.org
     ports:
       - 8443:8443
@@ -53,7 +55,7 @@ services:
         max-file: "5"
 
   aai.searchservice.simpledemo.openecomp.org:
-    image: ${DOCKER_REGISTRY}/openecomp/search-data-service
+    image: ${DOCKER_REGISTRY}/onap/search-data-service
     hostname: aai.searchservice.simpledemo.openecomp.org
     volumes:
       - ${SEARCH_LOGS}:/logs
@@ -71,7 +73,7 @@ services:
         max-file: "5"
 
   datarouter:
-    image: ${DOCKER_REGISTRY}/openecomp/data-router
+    image: ${DOCKER_REGISTRY}/onap/data-router
     hostname: data-router
     volumes:
       - ${DATA_ROUTER_LOGS}:/logs
@@ -92,7 +94,7 @@ services:
         max-file: "5"
 
   model-loader:
-    image: ${DOCKER_REGISTRY}/openecomp/model-loader
+    image: ${DOCKER_REGISTRY}/onap/model-loader
     hostname: model-loader
     volumes:
       - ${MODEL_LOADER_LOGS}:/logs
@@ -106,7 +108,7 @@ services:
         max-file: "5"
 
   sparky-be:
-    image: ${DOCKER_REGISTRY}/openecomp/sparky-be
+    image: ${DOCKER_REGISTRY}/onap/sparky-be
     hostname: sparky-be
     volumes:
       - ${UI_LOGS}:/logs