diff options
| author |   liamfallon <liam.fallon@est.tech> | 2022-10-17 16:55:51 +0100 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2022-10-18 14:15:56 +0100 |
| commit | c3e8a4a2ed66e73c6b39d68924ae8e310e7541db (patch) | |
| tree | 83076413d38f24564020ca157bf6a2dd330f3747 /tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml | |
| parent | 9831c28c678f70640f6f84e73c9c3d15d3f5a4a6 (diff) | |
Fix hard coded versions in XACML-PDP tutorials
This commit adds variables to the docker-compse file for the
xacml-applicaiton tutorial and adds a startup script that downloads
files fromt he docker/csit repo to run the tutorial
This commit also removes the separate docker-compose file that was used
for xacml-enforcement tutorial and replaces it with instructions on how
to use the csit docker-compose to run the enforcement.
Issue-ID: POLICY-4186
Change-Id: Id1476e6c0949d3d57bdea9a696b985b60220ec78
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml')
| -rw-r--r-- | tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml b/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml index 22a9b97f..f0b153f9 100644 --- a/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml +++ b/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml @@ -1,5 +1,6 @@ # ============LICENSE_START======================================================= # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +19,7 @@ version: '2' services: mariadb: - image: mariadb:10.2.14 + image: ${CONTAINER_LOCATION}mariadb:${POLICY_MARIADB_VER} container_name: mariadb hostname: mariadb command: ['--lower-case-table-names=1', '--wait_timeout=28800'] @@ -28,7 +29,7 @@ services: expose: - 3306 message-router: - image: nexus3.onap.org:10001/onap/policy-models-simulator:2.7.0-SNAPSHOT + image: ${CONTAINER_LOCATION}onap/policy-models-simulator:${POLICY_MODELS_VERSION} container_name: dmaap-simulator hostname: dmaap-simulator volumes: @@ -38,7 +39,7 @@ services: expose: - 3904 api: - image: nexus3.onap.org:10001/onap/policy-api:2.7.0-SNAPSHOT + image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION} container_name: policy-api depends_on: - mariadb @@ -48,7 +49,7 @@ services: expose: - 6767 pap: - image: nexus3.onap.org:10001/onap/policy-pap:2.7.0-SNAPSHOT + image: ${CONTAINER_LOCATION}onap/policy-pap:${POLICY_PAP_VERSION} container_name: policy-pap depends_on: - mariadb @@ -60,7 +61,7 @@ services: expose: - 6868 xacml-pdp: - image: onap/policy-xacml-tutorial:2.7.0-SNAPSHOT + image: onap/policy-xacml-tutorial:${POLICY_XACML_TUTORIAL_VERSION} container_name: policy-xacml-pdp depends_on: - mariadb |