Modified to run both on guilin and master branch

[integration/csit.git] / scripts / policy / policy-apex-pdp / docker-compose-apex.yml

diff --git a/scripts/policy/policy-apex-pdp/docker-compose-apex.yml b/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
index c6578dd..b7ba21c 100644 (file)
--- a/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
+++ b/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
@@ -18,7 +18,7 @@ networks:
     driver: bridge
 services:
    mariadb:
-      image: mariadb:10.2.14
+      image: mariadb:${POLICY_MARIADB_VER}
       container_name: mariadb
       hostname: mariadb
       command: ['--lower-case-table-names=1', '--wait_timeout=28800']
@@ -34,7 +34,7 @@ services:
       ports:
        - "3904:3904"
    pap:
-      image: nexus3.onap.org:10001/onap/policy-pap
+      image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION}
       container_name: policy-pap
       depends_on:
        - mariadb
@@ -42,20 +42,20 @@ services:
       hostname: policy-pap
 
    api:
-      image: nexus3.onap.org:10001/onap/policy-api
+      image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
       container_name: policy-api
       depends_on:
        - mariadb
       hostname: policy-api
    apex:
-      image: nexus3.onap.org:10001/onap/policy-apex-pdp
+      image: nexus3.onap.org:10001/onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION}
       container_name: policy-apex-pdp
       depends_on:
        - mariadb
        - message-router
        - pap
       hostname: policy-apex-pdp
-      command: ['/opt/app/policy/apex-pdp/bin/apexOnapPf.sh', '-c', '/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json', '-p', '/opt/app/policy/apex-pdp/etc/onappf/config/topic.properties']
+      command: ['/opt/app/policy/apex-pdp/bin/apexOnapPf.sh', '-c', '/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json']
 
       ports:
        - "6969:6969"