Merge "Update CSIT to use Frankfurt images"

[integration/csit.git] / scripts / policy / docker-compose-drools-apps.yml

diff --git a/scripts/policy/docker-compose-drools-apps.yml b/scripts/policy/docker-compose-drools-apps.yml
index a42c299..704de81 100644 (file)
--- a/scripts/policy/docker-compose-drools-apps.yml
+++ b/scripts/policy/docker-compose-drools-apps.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.
@@ -14,34 +14,28 @@
 version: '2'
 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: 
+      env_file:
          - ${WORKSPACE}/scripts/policy/config/db/db.conf
       volumes:
          - ${WORKSPACE}/scripts/policy/config/db:/docker-entrypoint-initdb.d
       expose:
        - 3306
    drools:
-      image: nexus3.onap.org:10001/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest
+      image: nexus3.onap.org:10001/onap/policy-pdpd-cl:${POLICY_DROOLS_APPS_VERSION}
       container_name: drools
-      depends_on: 
+      depends_on:
        - mariadb
       hostname: drools
       expose:
        - 6969
        - 9696
       volumes:
-       - ${WORKSPACE}/scripts/policy/config/drools:/tmp/policy-install/config
-      environment:
-       - DEBUG=y
-   start_dependencies:
-      image: dadarek/wait-for-dependencies
-      container_name: policy-wait
-      depends_on:
-       - mariadb
-      hostname: policy-wait
-      command: mariadb:3306
-
+       - ${WORKSPACE}/scripts/policy/config/drools-apps/custom:/tmp/policy-install/config
+      env_file:
+        - ${WORKSPACE}/scripts/policy/config/drools-apps/env/base.conf
+        - ${WORKSPACE}/scripts/policy/config/drools-apps/env/feature-healthcheck.conf
+        - ${WORKSPACE}/scripts/policy/config/drools-apps/env/feature-pooling-dmaap.conf