X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker-compose-app.yml;h=6a6ccff17fddc411f2730f4754b9bfc38db499ee;hb=c98976b030ed96f41a59d19d8a86717d483973b9;hp=18d5f9a40587c7012270d4d99c45f148f1bd96ae;hpb=5b1de57d352dd6903385731ee9611300f05e8abd;p=aai%2Ftest-config.git

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index 18d5f9a..6a6ccff 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -1,47 +1,51 @@
 version: '2'
 services:
-  aai-resources.api.simpledemo.openecomp.org:
-    image: ${DOCKER_REGISTRY}/openecomp/aai-resources
-    hostname: aai-resources.api.simpledemo.openecomp.org
+  aai-resources.api.simpledemo.onap.org:
+    image: ${DOCKER_REGISTRY}/onap/aai-resources
+    hostname: aai-resources.api.simpledemo.onap.org
     environment:
       - AAI_CHEF_ENV=simpledemo
       - AAI_CHEF_LOC=/var/chef/aai-data/environments
       - CHEF_BRANCH=master
       - CHEF_GIT_URL=http://gerrit.onap.org/r/aai
-    ports: 
+      - AAI_CORE_VERSION=1.1.0-SNAPSHOT
+      - LOCAL_USER_ID=${USER_ID}
+    ports:
       - 8447:8447
-    volumes: 
+    volumes:
       - ${RESOURCES_LOGS}:/opt/aai/logroot/AAI-RES
     logging:
       driver: "json-file"
       options:
         max-size: "30m"
         max-file: "5"
-  aai-traversal.api.simpledemo.openecomp.org:
-    image: ${DOCKER_REGISTRY}/openecomp/aai-traversal
-    hostname: aai-traversal.api.simpledemo.openecomp.org
+  aai-traversal.api.simpledemo.onap.org:
+    image: ${DOCKER_REGISTRY}/onap/aai-traversal
+    hostname: aai-traversal.api.simpledemo.onap.org
     environment:
       - AAI_CHEF_ENV=simpledemo
       - AAI_CHEF_LOC=/var/chef/aai-data/environments
       - CHEF_BRANCH=master
       - CHEF_GIT_URL=http://gerrit.onap.org/r/aai
-    volumes: 
+      - AAI_CORE_VERSION=1.1.0-SNAPSHOT
+      - LOCAL_USER_ID=${USER_ID}
+    volumes:
       - ${TRAVERSAL_LOGS}:/opt/aai/logroot/AAI-GQ
-    ports: 
+    ports:
       - 8446:8446
     logging:
       driver: "json-file"
       options:
         max-size: "30m"
         max-file: "5"
-  aai.api.simpledemo.openecomp.org:
-    image: ${AAI_HAPROXY_IMAGE}
-    hostname: aai.api.simpledemo.openecomp.org
-    ports: 
+  aai.api.simpledemo.onap.org:
+    image: ${AAI_HAPROXY_IMAGE}:${AAI_HAPROXY_VERSION}
+    hostname: aai.api.simpledemo.onap.org
+    ports:
       - 8443:8443
-    links: 
-      - aai-resources.api.simpledemo.openecomp.org
-      - aai-traversal.api.simpledemo.openecomp.org
+    links:
+      - aai-resources.api.simpledemo.onap.org
+      - aai-traversal.api.simpledemo.onap.org
     volumes:
       - /dev/log:/dev/log
     logging:
@@ -49,8 +53,80 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
+
+  aai.searchservice.simpledemo.openecomp.org:
+    image: ${DOCKER_REGISTRY}/onap/search-data-service
+    hostname: aai.searchservice.simpledemo.openecomp.org
+    volumes:
+      - ${SEARCH_LOGS}:/logs
+      - /opt/test-config/search-data-service/appconfig:/opt/app/search-data-service/config
+    ports:
+      - 9509:9509
+    environment:
+      - CONFIG_HOME=/opt/app/search-data-service/config/
+      - KEY_STORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - KEY_MANAGER_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+
+  datarouter:
+    image: ${DOCKER_REGISTRY}/onap/data-router
+    hostname: data-router
+    volumes:
+      - ${DATA_ROUTER_LOGS}:/logs
+      - /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:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - KEY_MANAGER_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - DYNAMIC_ROUTES=/opt/app/data-router/dynamic/routes
+      - SERVICE_BEANS=/opt/app/data-router/dynamic/conf
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+
+  model-loader:
+    image: ${DOCKER_REGISTRY}/onap/model-loader
+    hostname: model-loader
+    volumes:
+      - ${MODEL_LOADER_LOGS}:/logs
+      - /opt/test-config/model-loader/appconfig:/opt/app/model-loader/config
+    environment:
+      - CONFIG_HOME=/opt/app/model-loader/config/
+    logging:
+      driver: "json-file"
+      options:
+        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: 
+  default:
       driver: bridge
       driver_opts:
         com.docker.network.driver.mtu: ${MTU}