Updated sparky

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

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index d2395d2..13bcac7 100644 (file)
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -18,7 +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-schema/:/opt/app/aai-resources/resources/schema/
+      - /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,7 +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-schema/:/opt/app/aai-resources/resources/schema/
+      - /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:
@@ -65,7 +77,6 @@ services:
       - /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
-      - /opt/test-config/aai-schema/:/opt/app/aai-resources/resources/schema/
     ports:
       - 8449:8449
     logging:
@@ -149,14 +160,18 @@ services:
     hostname: sparky-be
     volumes:
       - ${UI_LOGS}:/logs
-      - /opt/test-config/sparky/appconfig:/opt/app/sparky/appconfig
+      - /opt/test-config/sparky/appconfig/auth:/opt/app/sparky/config/auth
+      - /opt/test-config/sparky/appconfig/portal:/opt/app/sparky/config/portal
+      - /opt/test-config/sparky/appconfig/application.properties:/opt/app/sparky/config/application.properties
+      - /opt/test-config/sparky/appconfig/application-oxm-default.properties:/opt/app/sparky/config/application-oxm-default.properties
+      - /opt/test-config/sparky/appconfig/application-oxm-schema-prod.properties:/opt/app/sparky/config/application-oxm-schema-prod.properties
+      - /opt/test-config/sparky/appconfig/application-resources.properties:/opt/app/sparky/config/application-resources.properties
+      - /opt/test-config/sparky/appconfig/application-ssl.properties:/opt/app/sparky/config/application-ssl.properties
+      - /opt/test-config/sparky/appconfig/users.config:/opt/app/sparky/config/users.config
+      - /opt/test-config/sparky/appconfig/roles.config:/opt/app/sparky/config/roles.config
+
     ports:
       - 9517:9517
-    environment:
-      - KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
-      - KEYSTORE_ALIAS_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
-      - SPARKY_SSL_ENABLED=false
-      - SPARKY_PORTAL_ENABLED=true
     logging:
       driver: "json-file"
       options:
@@ -168,6 +183,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: