From: Henrik Andersson <henrik.b.andersson@est.tech>
Date: Mon, 1 Jun 2020 06:10:52 +0000 (+0000)
Subject: Merge "App config path changed"
X-Git-Tag: 2.0.0~27
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=d9df6244e4ba89b71cba364f156ca529c3703faa;hp=cd4d0e141b1e4ab07e8c89da2e002378826b7111;p=nonrtric.git

Merge "App config path changed"
---

diff --git a/policy-agent/Dockerfile b/policy-agent/Dockerfile
index da9fd448..75da2402 100644
--- a/policy-agent/Dockerfile
+++ b/policy-agent/Dockerfile
@@ -27,7 +27,8 @@ RUN mkdir -p /opt/app/policy-agent/etc/cert/
 
 EXPOSE 8081 8433
 
-ADD /config/* /opt/app/policy-agent/config/
+ADD /config/application.yaml /opt/app/policy-agent/config/application.yaml
+ADD /config/application_configuration.json /opt/app/policy-agent/data/application_configuration.json
 ADD target/${JAR} /opt/app/policy-agent/policy-agent.jar
 
 
diff --git a/policy-agent/config/application.yaml b/policy-agent/config/application.yaml
index c0ddfb57..aac43930 100644
--- a/policy-agent/config/application.yaml
+++ b/policy-agent/config/application.yaml
@@ -29,7 +29,7 @@ server:
       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
diff --git a/policy-agent/config/application_configuration.json_example b/policy-agent/config/application_configuration.json
similarity index 100%
rename from policy-agent/config/application_configuration.json_example
rename to policy-agent/config/application_configuration.json