diff options
| author |   Liam Fallon <liam.fallon@est.tech> | 2022-05-27 13:42:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-05-27 13:42:22 +0000 |
| commit | fa68f62ea609de7789f9780645f495b39ec0999f (patch) | |
| tree | 4ff1bddf8464f91caf4ef26c81d5f48b14df1b81 | |
| parent | 86c91fd09daeb36367bf4c99eda9a52b4523521b (diff) | |
| parent | 787a74d9cafbd5117180e090200f296fd8c1025a (diff) | |
Merge "Update Docker Tag related configurations in XACML Tutorial code"
3 files changed, 7 insertions, 8 deletions
diff --git a/tutorials/tutorial-xacml-application/pom.xml b/tutorials/tutorial-xacml-application/pom.xml index d270e9cf..ad4d6274 100644 --- a/tutorials/tutorial-xacml-application/pom.xml +++ b/tutorials/tutorial-xacml-application/pom.xml @@ -64,9 +64,10 @@ <artifactId>docker-maven-plugin</artifactId> <configuration> <verbose>true</verbose> + <imagePullPolicy>Always</imagePullPolicy> <images> <image> - <name>onap/policy-xacml-tutorial</name> + <name>onap/policy-xacml-tutorial:${project.version}</name> <alias>xacml-pdp</alias> <build> <contextDir>${project.basedir}/src/main/docker</contextDir> diff --git a/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile b/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile index 26106512..943658d9 100644 --- a/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile +++ b/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/policy-xacml-pdp +FROM onap/policy-xacml-pdp:2.7.0-SNAPSHOT ADD maven/${project.build.finalName}.jar /opt/app/policy/pdpx/lib/${project.build.finalName}.jar 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 a3b72bea..22a9b97f 100644 --- a/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml +++ b/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml @@ -28,7 +28,7 @@ services: expose: - 3306 message-router: - image: nexus3.onap.org:10001/onap/policy-models-simulator:latest + image: nexus3.onap.org:10001/onap/policy-models-simulator:2.7.0-SNAPSHOT container_name: dmaap-simulator hostname: dmaap-simulator volumes: @@ -38,8 +38,7 @@ services: expose: - 3904 api: - # Istanbul To Be released images - image: nexus3.onap.org:10001/onap/policy-api:2.5.0-SNAPSHOT + image: nexus3.onap.org:10001/onap/policy-api:2.7.0-SNAPSHOT container_name: policy-api depends_on: - mariadb @@ -49,8 +48,7 @@ services: expose: - 6767 pap: - # Istanbul To Be released images - image: nexus3.onap.org:10001/onap/policy-pap:2.5.0-SNAPSHOT + image: nexus3.onap.org:10001/onap/policy-pap:2.7.0-SNAPSHOT container_name: policy-pap depends_on: - mariadb @@ -62,7 +60,7 @@ services: expose: - 6868 xacml-pdp: - image: onap/policy-xacml-tutorial + image: onap/policy-xacml-tutorial:2.7.0-SNAPSHOT container_name: policy-xacml-pdp depends_on: - mariadb |