Work around docker rate limit in CSITs

[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 e836a58..0201cc9 100644 (file)
--- a/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
+++ b/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
@@ -1,5 +1,5 @@
 # Copyright (C) 2019 Nordix Foundation.
-# Modifications Copyright (C) 2019 AT&T Intellectual Property.
+# Modifications Copyright (C) 2019-2020 AT&T Intellectual Property.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ networks:
     driver: bridge
 services:
    mariadb:
-      image: mariadb:10.2.14
+      image: nexus3.onap.org:10001/mariadb:${POLICY_MARIADB_VER}
       container_name: mariadb
       hostname: mariadb
       command: ['--lower-case-table-names=1', '--wait_timeout=28800']
@@ -27,38 +27,36 @@ services:
          - ./config/db:/docker-entrypoint-initdb.d
       ports:
        - "3306:3306"
-   dmaap:
+   message-router:
       image: dmaap/simulator
       container_name: dmaap-simulator
       hostname: dmaap-simulator
       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
-       - dmaap
+       - message-router
       hostname: policy-pap
-      volumes:
-         - ./config/pap/:/opt/app/policy/pap/etc/
+
    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
-       - dmaap
+       - 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']
-      volumes:
-         - ./config/apex-pdp/:/opt/app/policy/apex-pdp/etc/onappf/config/
+      command: ['/opt/app/policy/apex-pdp/bin/apexOnapPf.sh', '-c', '/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json']
+
       ports:
        - "6969:6969"
        - "23324:23324"
@@ -69,11 +67,11 @@ services:
       container_name: policy-wait
       depends_on:
         - mariadb
-        - dmaap
+        - message-router
       hostname: policy-wait
       command:
         mariadb:3306
-        dmaap:3904
+        message-router:3904
    start_all:
       image: dadarek/wait-for-dependencies
       environment:
@@ -81,14 +79,14 @@ services:
       container_name: policy-wait-all
       depends_on:
         - mariadb
-        - dmaap
+        - message-router
         - api
         - pap
         - apex
       hostname: policy-wait-all
       command:
         mariadb:3306
-        dmaap:3904
+        message-router:3904
         api:6969
         pap:6969
         apex:6969