X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker-compose-app.yml;h=5ca36384b023f7963c0d1b38f848cd79ac4f227d;hb=21ddab54c2eead1f17bd3eaf76b4be5405a364db;hp=b20d06a3779ef749619109e1d575e14fa37efae8;hpb=3352e2f1c37b5dadd756aada11ef0d822b2a32ca;p=aai%2Ftest-config.git

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index b20d06a..5ca3638 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -4,16 +4,21 @@ services:
     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
-      - AAI_CORE_VERSION=1.1.0-SNAPSHOT
       - LOCAL_USER_ID=${USER_ID}
+      - LOCAL_GROUP_ID=${GROUP_ID}
+      - SKIP_CREATE_DB_SCHEMA_AT_STARTUP=true
     ports:
       - 8447:8447
     volumes:
       - ${RESOURCES_LOGS}:/opt/aai/logroot/AAI-RES
+      - /opt/test-config/aai-resources/appconfig/janusgraph-realtime.properties:/opt/app/aai-resources/resources/etc/appprops/janusgraph-realtime.properties
+      - /opt/test-config/aai-resources/appconfig/janusgraph-cached.properties:/opt/app/aai-resources/resources/etc/appprops/janusgraph-cached.properties
+      - /opt/test-config/aai-resources/appconfig/aaiconfig.properties:/opt/app/aai-resources/resources/etc/appprops/aaiconfig.properties
+      - /opt/test-config/aai-resources/appconfig/application.properties:/opt/app/aai-resources/resources/application.properties
+      - /opt/test-config/aai-resources/appconfig/logback.xml:/opt/app/aai-resources/resources/logback.xml
+      - /opt/test-config/aai-resources/appconfig/localhost-access-logback.xml:/opt/app/aai-resources/resources/localhost-access-logback.xml
+      - /opt/test-config/aai-resources/appconfig/aai_keystore:/opt/app/aai-resources/resources/etc/auth/aai_keystore
+      - /opt/test-config/aai-resources/appconfig/realm.properties:/opt/app/aai-resources/resources/etc/auth/realm.properties
     logging:
       driver: "json-file"
       options:
@@ -23,14 +28,19 @@ services:
     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
-      - AAI_CORE_VERSION=1.1.0-SNAPSHOT
       - LOCAL_USER_ID=${USER_ID}
+      - LOCAL_GROUP_ID=${GROUP_ID}
+      - DISABLE_UPDATE_QUERY=true
     volumes:
       - ${TRAVERSAL_LOGS}:/opt/aai/logroot/AAI-GQ
+      - /opt/test-config/aai-traversal/appconfig/janusgraph-realtime.properties:/opt/app/aai-traversal/resources/etc/appprops/janusgraph-realtime.properties
+      - /opt/test-config/aai-traversal/appconfig/janusgraph-cached.properties:/opt/app/aai-traversal/resources/etc/appprops/janusgraph-cached.properties
+      - /opt/test-config/aai-traversal/appconfig/aaiconfig.properties:/opt/app/aai-traversal/resources/etc/appprops/aaiconfig.properties
+      - /opt/test-config/aai-traversal/appconfig/application.properties:/opt/app/aai-traversal/resources/application.properties
+      - /opt/test-config/aai-traversal/appconfig/logback.xml:/opt/app/aai-traversal/resources/logback.xml
+      - /opt/test-config/aai-traversal/appconfig/localhost-access-logback.xml:/opt/app/aai-traversal/resources/localhost-access-logback.xml
+      - /opt/test-config/aai-traversal/appconfig/aai_keystore:/opt/app/aai-traversal/resources/etc/auth/aai_keystore
+      - /opt/test-config/aai-traversal/appconfig/realm.properties:/opt/app/aai-traversal/resources/etc/auth/realm.properties
     ports:
       - 8446:8446
     logging:
@@ -48,6 +58,7 @@ services:
       - aai-traversal.api.simpledemo.onap.org
     volumes:
       - /dev/log:/dev/log
+      - /opt/test-config/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
     logging:
       driver: "json-file"
       options:
@@ -126,7 +137,7 @@ services:
         max-file: "5"
 
   champ-service:
-    image: ${DOCKER_REGISTRY}/onap/champ-service
+    image: ${DOCKER_REGISTRY}/onap/champ
     hostname: champ-service
     volumes:
       - ${CHAMP_LOGS}:/logs
@@ -149,9 +160,9 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-        
+
   crud-service:
-    image: ${DOCKER_REGISTRY}/onap/crud-service
+    image: ${DOCKER_REGISTRY}/onap/gizmo
     hostname: crud-service
     volumes:
       - ${CRUD_LOGS}:/logs
@@ -174,6 +185,23 @@ services:
         max-size: "30m"
         max-file: "5"
 
+  babel:
+    image: ${DOCKER_REGISTRY}/onap/babel
+    hostname: babel
+    volumes:
+      - ${BABEL_LOGS}:/logs
+      - /opt/test-config/babel/appconfig:/opt/app/babel/config      
+    ports:
+      - 9516:9516
+    environment:
+      - CONFIG_HOME=/opt/app/babel/config/
+      - KEY_STORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - KEY_MANAGER_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
 networks:
   default:
       driver: bridge