Merge "Create docker-compose file"
diff --git a/policy-agent/Dockerfile b/policy-agent/Dockerfile
index da9fd44..75da240 100644
--- a/policy-agent/Dockerfile
+++ b/policy-agent/Dockerfile
@@ -27,7 +27,8 @@
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 c0ddfb5..aac4393 100644
--- a/policy-agent/config/application.yaml
+++ b/policy-agent/config/application.yaml
@@ -29,7 +29,7 @@
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
diff --git a/test/simulator-group/ric/docker-compose.yml b/test/simulator-group/ric/docker-compose.yml
index 701a7f5..70ec587 100644
--- a/test/simulator-group/ric/docker-compose.yml
+++ b/test/simulator-group/ric/docker-compose.yml
@@ -34,6 +34,7 @@
environment:
- A1_VERSION=${G1_A1_VERSION}
- REMOTE_HOSTS_LOGGING=1
+ - ALLOW_HTTP=true
volumes:
- ${RIC_SIM_CERT_MOUNT_DIR}:/usr/src/app/cert:ro
g2:
@@ -46,6 +47,7 @@
environment:
- A1_VERSION=${G2_A1_VERSION}
- REMOTE_HOSTS_LOGGING=1
+ - ALLOW_HTTP=true
volumes:
- ${RIC_SIM_CERT_MOUNT_DIR}:/usr/src/app/cert:ro
g3:
@@ -58,5 +60,6 @@
environment:
- A1_VERSION=${G3_A1_VERSION}
- REMOTE_HOSTS_LOGGING=1
+ - ALLOW_HTTP=true
volumes:
- ${RIC_SIM_CERT_MOUNT_DIR}:/usr/src/app/cert:ro
\ No newline at end of file