X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker-compose-app.yml;h=fd5c7b970ced069cadaa9fb66d4c419fd1660638;hb=8ae608b6c3e58b545f19d552915943abd8bade59;hp=289d2d169c41035c4ca64d26deaf3ad5982d5298;hpb=1fe4ee31aebc4bf9cc554b7a8e44e3a0046f8ce6;p=aai%2Ftest-config.git

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index 289d2d1..fd5c7b9 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -6,7 +6,6 @@ services:
     environment:
       - LOCAL_USER_ID=${USER_ID}
       - LOCAL_GROUP_ID=${GROUP_ID}
-      - SKIP_CREATE_DB_SCHEMA_AT_STARTUP=true
     ports:
       - 8447:8447
     volumes:
@@ -19,6 +18,13 @@ services:
       - /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
+      - /opt/test-config/aai-resources/appconfig/aaf/cadi.properties:/opt/app/aai-resources/resources/cadi.properties
+      - /opt/test-config/aai-resources/appconfig/aaf/org.onap.aai.keyfile:/opt/app/aai-resources/resources/aaf/org.onap.aai.keyfile
+      - /opt/test-config/aai-resources/appconfig/aaf/org.onap.aai.p12:/opt/app/aai-resources/resources/aaf/org.onap.aai.p12
+      - /opt/test-config/aai-resources/appconfig/aaf/org.onap.aai.props:/opt/app/aai-resources/resources/aaf/org.onap.aai.props
+      - /opt/test-config/aai-resources/appconfig/aaf/org.osaaf.location.props:/opt/app/aai-resources/resources/aaf/org.osaaf.location.props
+      - /opt/test-config/aai-resources/appconfig/aaf/permissions.properties:/opt/app/aai-resources/resources/aaf/permissions.properties
+      - /opt/test-config/aai-resources/appconfig/aaf/truststoreONAPall.jks:/opt/app/aai-resources/resources/aaf/truststoreONAPall.jks
     logging:
       driver: "json-file"
       options:
@@ -41,6 +47,13 @@ services:
       - /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
+      - /opt/test-config/aai-traversal/appconfig/aaf/cadi.properties:/opt/app/aai-traversal/resources/cadi.properties
+      - /opt/test-config/aai-traversal/appconfig/aaf/org.onap.aai.keyfile:/opt/app/aai-traversal/resources/aaf/org.onap.aai.keyfile
+      - /opt/test-config/aai-traversal/appconfig/aaf/org.onap.aai.p12:/opt/app/aai-traversal/resources/aaf/org.onap.aai.p12
+      - /opt/test-config/aai-traversal/appconfig/aaf/org.onap.aai.props:/opt/app/aai-traversal/resources/aaf/org.onap.aai.props
+      - /opt/test-config/aai-traversal/appconfig/aaf/org.osaaf.location.props:/opt/app/aai-traversal/resources/aaf/org.osaaf.location.props
+      - /opt/test-config/aai-traversal/appconfig/aaf/permissions.properties:/opt/app/aai-traversal/resources/aaf/permissions.properties
+      - /opt/test-config/aai-traversal/appconfig/aaf/truststoreONAPall.jks:/opt/app/aai-traversal/resources/aaf/truststoreONAPall.jks
     ports:
       - 8446:8446
     logging:
@@ -48,6 +61,29 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
+  aai-graphadmin.api.simpledemo.onap.org:
+    image: ${DOCKER_REGISTRY}/onap/aai-graphadmin
+    hostname: aai-graphadmin.api.simpledemo.onap.org
+    environment:
+      - LOCAL_USER_ID=${USER_ID}
+      - LOCAL_GROUP_ID=${GROUP_ID}
+    volumes:
+      - ${GRAPHADMIN_LOGS}:/opt/aai/logroot/AAI-GA
+      - /opt/test-config/aai-graphadmin/appconfig/janusgraph-realtime.properties:/opt/app/aai-graphadmin/resources/etc/appprops/janusgraph-realtime.properties
+      - /opt/test-config/aai-graphadmin/appconfig/janusgraph-cached.properties:/opt/app/aai-graphadmin/resources/etc/appprops/janusgraph-cached.properties
+      - /opt/test-config/aai-graphadmin/appconfig/aaiconfig.properties:/opt/app/aai-graphadmin/resources/etc/appprops/aaiconfig.properties
+      - /opt/test-config/aai-graphadmin/appconfig/application.properties:/opt/app/aai-graphadmin/resources/application.properties
+      - /opt/test-config/aai-graphadmin/appconfig/logback.xml:/opt/app/aai-graphadmin/resources/logback.xml
+      - /opt/test-config/aai-graphadmin/appconfig/localhost-access-logback.xml:/opt/app/aai-graphadmin/resources/localhost-access-logback.xml
+      - /opt/test-config/aai-graphadmin/appconfig/aai_keystore:/opt/app/aai-graphadmin/resources/etc/auth/aai_keystore
+      - /opt/test-config/aai-graphadmin/appconfig/realm.properties:/opt/app/aai-graphadmin/resources/etc/auth/realm.properties
+    ports:
+      - 8449:8449
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
   aai.api.simpledemo.onap.org:
     image: ${AAI_HAPROXY_IMAGE}:${AAI_HAPROXY_VERSION}
     hostname: aai.api.simpledemo.onap.org
@@ -59,6 +95,7 @@ services:
     volumes:
       - /dev/log:/dev/log
       - /opt/test-config/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
+      - /opt/test-config/haproxy/aai.pem:/etc/ssl/private/aai.pem
     logging:
       driver: "json-file"
       options:
@@ -123,7 +160,7 @@ services:
     hostname: sparky-be
     volumes:
       - ${UI_LOGS}:/logs
-      - /opt/test-config/sparky/appconfig:/opt/app/sparky/appconfig
+      - /opt/test-config/sparky/appconfig:/opt/app/sparky/config
     ports:
       - 9517:9517
     environment:
@@ -142,6 +179,7 @@ services:
     hostname: champ-service
     volumes:
       - ${CHAMP_LOGS}:/logs
+      - /opt/test-config/champ-service/logging/logback.xml:/opt/app/champ-service/bundleconfig/etc/logback.xml
       - /opt/test-config/champ-service/appconfig:/opt/app/champ-service/config
       - /opt/test-config/champ-service/dynamic:/opt/app/champ-service/dynamic
     ports:
@@ -155,7 +193,7 @@ services:
       - AJSC_JETTY_BLOCKING_QUEUE_SIZE=200
       - MAX_HEAP=1024
       - SERVICE_BEANS=/opt/app/champ-service/dynamic/conf
-      - GRAPHIMPL=titan-deps
+      - GRAPHIMPL=janus-deps
     logging:
       driver: "json-file"
       options:
@@ -185,12 +223,36 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
+        
+  spike-service:
+    image: ${DOCKER_REGISTRY}/onap/spike
+    hostname: spike-service
+    volumes:
+      - ${SPIKE_LOGS}:/logs
+      - /opt/test-config/spike-service/appconfig:/opt/app/spike-service/config
+      - /opt/test-config/spike-service/dynamic:/opt/app/spike-service/dynamic
+    ports:
+      - 9518:9518
+    environment:
+      - CONFIG_HOME=/opt/app/spike-service/config/
+      - KEY_STORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - KEY_MANAGER_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - AJSC_JETTY_ThreadCount_MIN=5
+      - AJSC_JETTY_ThreadCount_MAX=200
+      - AJSC_JETTY_BLOCKING_QUEUE_SIZE=200
+      - MAX_HEAP=1024
+      - SERVICE_BEANS=/opt/app/spike-service/dynamic/conf
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
 
   babel:
     image: ${DOCKER_REGISTRY}/onap/babel
     hostname: babel
     volumes:
-      - ${BABEL_LOGS}:/logs
+      - ${BABEL_LOGS}:/opt/app/babel/logs/AAI-BAS
       - /opt/test-config/babel/appconfig:/opt/app/babel/config      
     ports:
       - 9516:9516