X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fpolicy%2Fdocker-compose-pap.yml;h=934e17392d3ebd69d0171b2dafa5a1eae4468980;hb=e8725131014daf39725e37d518c5b9766d86ee46;hp=383e1bc8a432787bd88182d02458bb5382a55786;hpb=e94b274e3060cd3e2b46901a168738b8cfd3972f;p=integration%2Fcsit.git

diff --git a/scripts/policy/docker-compose-pap.yml b/scripts/policy/docker-compose-pap.yml
index 383e1bc8..934e1739 100644
--- a/scripts/policy/docker-compose-pap.yml
+++ b/scripts/policy/docker-compose-pap.yml
@@ -1,4 +1,4 @@
-# Copyright 2019 AT&T Intellectual Property. All rights reserved
+# Copyright 2019-2020 AT&T Intellectual Property. All rights reserved
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,36 +12,39 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 version: '2'
-networks:
-  default:
-    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']
       env_file: config/db/db.conf
       volumes:
          - ./config/db:/docker-entrypoint-initdb.d
-      ports:
-       - "3306:3306"
+      expose:
+       - 3306
+   message-router:
+      image: dmaap/simulator
+      container_name: dmaap-simulator
+      hostname: dmaap-simulator
+      expose:
+       - 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: 
+      depends_on:
        - mariadb
       hostname: policy-pap
-      ports:
-       - "6969:6969"
+      expose:
+       - 6969
    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
-      ports:
-       - "9969:6969"
+      expose:
+       - 6969
    start_dependencies:
       image: dadarek/wait-for-dependencies
       environment:
@@ -49,8 +52,11 @@ services:
       container_name: policy-wait
       depends_on:
         - mariadb
+        - message-router
       hostname: policy-wait
-      command: mariadb:3306
+      command:
+        mariadb:3306
+        message-router:3904
    start_all:
       image: dadarek/wait-for-dependencies
       environment:
@@ -63,5 +69,6 @@ services:
       hostname: policy-wait-all
       command:
         mariadb:3306
+        message-router:3904
         pap:6969
         api:6969