X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker-compose-app.yml;h=778d72794719adeb5732aa59f792074076796c0d;hb=ab3197c0e77407ac2bbdbe941a289de175e9ed99;hp=6f2602fccda24812e62117cec15ddcf1d2969f42;hpb=47c9e81f4bd772e70c7dafd399b82857557c9504;p=aai%2Ftest-config.git

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index 6f2602f..778d727 100644
--- 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,11 +55,11 @@ 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
-      - /opt/app/search-data-service/appconfig:/opt/app/search-data-service/config
+      - /opt/test-config/search-data-service/appconfig:/opt/app/search-data-service/config
     ports:
       - 9509:9509
     environment:
@@ -71,17 +73,17 @@ services:
         max-file: "5"
 
   datarouter:
-    image: ${DOCKER_REGISTRY}/openecomp/datarouter-service
-    hostname: datarouter
+    image: ${DOCKER_REGISTRY}/onap/data-router
+    hostname: data-router
     volumes:
       - ${DATA_ROUTER_LOGS}:/logs
-      - /opt/app/datarouter-service/appconfig:/opt/app/data-router/config
-      - /opt/app/datarouter-service/dynamic:/opt/app/data-router/dynamic
+      - /opt/test-config/data-router/appconfig:/opt/app/data-router/config
+      - /opt/test-config/data-router/dynamic:/opt/app/data-router/dynamic
     ports:
       - 9502:9502
     environment:
       - CONFIG_HOME=/opt/app/data-router/config/
-      - KEY_STORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+      - KEY_STORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
       - KEY_MANAGER_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
       - DYNAMIC_ROUTES=/opt/app/data-router/dynamic/routes
       - SERVICE_BEANS=/opt/app/data-router/dynamic/conf
@@ -92,11 +94,11 @@ 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
-      - /opt/app/model-loader/appconfig:/opt/app/model-loader/config
+      - /opt/test-config/model-loader/appconfig:/opt/app/model-loader/config
     environment:
       - CONFIG_HOME=/opt/app/model-loader/config/
     logging:
@@ -105,6 +107,24 @@ services:
         max-size: "30m"
         max-file: "5"
 
+  sparky-be:
+    image: ${DOCKER_REGISTRY}/onap/sparky-be
+    hostname: sparky-be
+    volumes:
+      - ${UI_LOGS}:/logs
+      - /opt/test-config/sparky/appconfig:/opt/app/sparky/config
+    ports:
+      - 9517:9517
+    environment:
+      - CONFIG_HOME=/opt/app/sparky/config
+      - KEY_STORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+      - KEY_MANAGER_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+        
 networks:
   default:
       driver: bridge