From d46ab2eb2f4254adbe2b9f604b12c0a7f4bf99ed Mon Sep 17 00:00:00 2001 From: Bilal A Date: Fri, 7 Jun 2019 21:25:59 +0000 Subject: Pull correct docker images for master branch Enables Policy CSITs for API, PAP, Distribution, Drools-applications, Apex-PDP and XACML-PDP to pull correct docker images based on the code branch. -------------- Updating the policy model json in apex-pdp csit Changes were made to read the policy model as proper json instead of json formatted string in APEX-PDP. With this fix in place, the policy tosca json file need to be updated with the proper json. Issue-ID: POLICY-1836 Issue-ID: POLICY-1796 Change-Id: I6b99c8ae9cb78dd8ebddc522bc2a7080ec6e5735 Signed-off-by: a.sreekumar Signed-off-by: Bilal A --- scripts/policy/docker-compose-api.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/policy/docker-compose-api.yml') diff --git a/scripts/policy/docker-compose-api.yml b/scripts/policy/docker-compose-api.yml index 5cf5a27c..1bab1894 100644 --- a/scripts/policy/docker-compose-api.yml +++ b/scripts/policy/docker-compose-api.yml @@ -17,7 +17,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'] @@ -27,9 +27,9 @@ services: ports: - "3306:3306" 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: + depends_on: - mariadb hostname: policy-api ports: -- cgit 1.2.3-korg