X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker-compose%2Fdocker-compose-policy-framework%2Fdocker-compose.yml;h=894b117f4d618eae53952849c91931090af061a7;hb=HEAD;hp=8b13d483e3e1e815a1f51162a9867293d9012769;hpb=d56477412e7e574fe588f353973fc7e8c259fe2c;p=nonrtric.git

diff --git a/docker-compose/docker-compose-policy-framework/docker-compose.yml b/docker-compose/docker-compose-policy-framework/docker-compose.yml
index 8b13d483..894b117f 100644
--- a/docker-compose/docker-compose-policy-framework/docker-compose.yml
+++ b/docker-compose/docker-compose-policy-framework/docker-compose.yml
@@ -27,10 +27,13 @@ services:
       image: nexus3.onap.org:10001/mariadb:10.5.8
       container_name: mariadb
       hostname: mariadb
-      command: ['--lower-case-table-names=1', '--wait_timeout=28800']
-      env_file: config/db/db.conf
       volumes:
-         - ./config/db:/docker-entrypoint-initdb.d:ro
+       - db-vol:/var/lib/mysql
+       - "./config/db/:/docker-entrypoint-initdb.d:rw"
+      environment:
+       - MYSQL_ROOT_PASSWORD=strong_pitchou
+      ports:
+       - "3306:3306"
       expose:
        - 3306
    api:
@@ -40,10 +43,11 @@ services:
        - mariadb
       hostname: policy-api
       ports:
-       - "6969:6969"
+       - "6869:6969"
       expose:
-       - 6969
+       - 6869
       volumes:
+       - ./config/api/defaultConfig.json:/opt/app/policy/api/etc/defaultConfig.json:ro
        - ./config/ks.jks:/opt/app/policy/api/etc/ssl/policy-keystore.jks:ro
        - ./wait_for_port.sh:/opt/app/policy/api/bin/wait_for_port.sh:ro
       entrypoint: ./wait_for_port.sh
@@ -70,7 +74,7 @@ services:
       command: [
         '-c', './policy-pap.sh',
         'mariadb', '3306',
-        'dmaap-mr', '3904',
+        'onap-dmaap', '3904',
         'api', '6969'
         ]
    xacml-pdp:
@@ -90,7 +94,7 @@ services:
       command: [
         '-c', './policy-pdpx.sh',
         'mariadb', '3306',
-        'dmaap-mr', '3904',
+        'onap-dmaap', '3904',
         'pap', '6969'
         ]
    drools:
@@ -112,7 +116,7 @@ services:
       command: [
         '-c', '/opt/app/policy/bin/pdpd-entrypoint.sh boot',
         'mariadb', '3306',
-        'dmaap-mr', '3904'
+        'onap-dmaap', '3904'
         ]
    drools-apps:
       image: nexus3.onap.org:10001/onap/policy-pdpd-cl:1.8.2
@@ -137,11 +141,11 @@ services:
       command: [
         '-c', '/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot',
         'mariadb', '3306',
-        'dmaap-mr', '3904',
+        'onap-dmaap', '3904',
         'pap', '6969'
         ]
    apex-pdp:
-      image: onap/policy-apex-pdp:latest
+      image: nexus3.onap.org:10001/onap/policy-apex-pdp:2.5.4
       container_name: policy-apex-pdp
       depends_on:
        - mariadb
@@ -158,7 +162,7 @@ services:
       command: [
         '-c', '/opt/app/policy/apex-pdp/bin/apexOnapPf.sh -c /opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json',
         'mariadb', '3306',
-        'dmaap-mr', '3904',
+        'onap-dmaap', '3904',
         'pap', '6969'
         ]
    distribution:
@@ -179,7 +183,9 @@ services:
       command: [
         '-c', './policy-dist.sh',
         'mariadb', '3306',
-        'dmaap-mr', '3904',
+        'onap-dmaap', '3904',
         'pap', '6969',
         'apex-pdp', '6969'
         ]
+volumes:
+  db-vol:
\ No newline at end of file