commit a9a369f89f777bbc830aee80f49f39b1513cba87
author RehanRaza <muhammad.rehan.raza@est.tech> Mon Jun 29 12:06:17 2020 +0200
committer RehanRaza <muhammad.rehan.raza@est.tech> Mon Jun 29 12:06:22 2020 +0200
tree 7d4c524af8b97a7e8dee196ba70e8b959713f0e8
parent 3483a78c55f1830dd0aa28f789ddf817ea1358c0

Update docker-compose for configurable certs

Change-Id: Iebf697c6f0a0e2d62e05afad2996f1eadefab297
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>

docker-compose/nosdnc/config/application-policyagent.yaml

diff --git a/docker-compose/nosdnc/config/application.yaml b/docker-compose/nosdnc/config/application-policyagent.yaml
similarity index 79%
rename from docker-compose/nosdnc/config/application.yaml
rename to docker-compose/nosdnc/config/application-policyagent.yaml
index c0ddfb5..e9146e0 100755
--- a/docker-compose/nosdnc/config/application.yaml
+++ b/docker-compose/nosdnc/config/application-policyagent.yaml
@@ -25,13 +25,13 @@
    ssl:
       key-store-type: JKS
       key-store-password: policy_agent
-      key-store: classpath:keystore.jks
+      key-store: /opt/app/policy-agent/etc/cert/keystore.jks
       key-password: policy_agent
       key-alias: policy_agent
 app:
-  filepath: /opt/app/policy-agent/config/application_configuration.json
+  filepath: /opt/app/policy-agent/data/application_configuration.json
   webclient:
     trust-store-used: false
     trust-store-password: policy_agent
-    trust-store: classpath:keystore.jks
+    trust-store: /opt/app/policy-agent/etc/cert/truststore.jks
 

docker-compose/nosdnc/docker-compose.yml

diff --git a/docker-compose/nosdnc/docker-compose.yml b/docker-compose/nosdnc/docker-compose.yml
index 043ecde..aa83c7a 100644
--- a/docker-compose/nosdnc/docker-compose.yml
+++ b/docker-compose/nosdnc/docker-compose.yml
@@ -26,7 +26,12 @@
       - 8081:8081
       - 8433:8433
     volumes:
-      - ./config:/opt/app/policy-agent/config:ro
+      - ./config/application_configuration.json:/opt/app/policy-agent/data/application_configuration.json:ro
+    # For using own certs instead of the default ones (built into the container),
+    # place them in config/ directory, update the application-policyagent.yaml file, and uncomment the following lines
+    #  - ./config/keystore-policyagent.jks:/opt/app/policy-agent/etc/cert/keystore.jks:ro
+    #  - ./config/truststore-policyagent.jks:/opt/app/policy-agent/etc/cert/truststore.jks:ro
+    #  - ./config/application-policyagent.yaml:/opt/app/policy-agent/config/application.yaml:ro
 
   a1-sim-OSC:
     image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.0.0