aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
diff options
context:
space:
mode:
authorBilal A <bilal@research.att.com>2019-06-07 21:25:59 +0000
committerBilal A <bilal@research.att.com>2019-07-03 16:06:05 +0000
commitd46ab2eb2f4254adbe2b9f604b12c0a7f4bf99ed (patch)
tree9c78e684c231f69dd42fbb29d2e9bfbea68f82d7 /scripts/policy/policy-apex-pdp/docker-compose-apex.yml
parent4a70dd3bcf1dde19d511f528650b08714b92448f (diff)
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 <ajith.sreekumar@est.tech> Signed-off-by: Bilal A <bilal@research.att.com>
Diffstat (limited to 'scripts/policy/policy-apex-pdp/docker-compose-apex.yml')
-rw-r--r--scripts/policy/policy-apex-pdp/docker-compose-apex.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/policy/policy-apex-pdp/docker-compose-apex.yml b/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
index c6578dda..c01aaaa5 100644
--- 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,13 +42,13 @@ 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