From 3a2afba5570a1fae4067088e2a5ef66b58172f1e Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Mon, 18 Jul 2022 17:25:16 +0100
Subject: Parameterize xacml-pdp tutorial docker file

This change parameterizes the XACML PDP tutorial so that it always works
off the version of XACML PDP on which it is released.

Issue-ID: POLICY-4186
Change-Id: If3891a21d6f60518da9d395228e700fe6d506dc2
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 tutorials/tutorial-xacml-application/pom.xml                 |  6 +++++-
 .../tutorial-xacml-application/src/main/docker/Dockerfile    | 12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/tutorials/tutorial-xacml-application/pom.xml b/tutorials/tutorial-xacml-application/pom.xml
index ad4d6274..9b1f33e3 100644
--- a/tutorials/tutorial-xacml-application/pom.xml
+++ b/tutorials/tutorial-xacml-application/pom.xml
@@ -72,8 +72,12 @@
                   <build>
                     <contextDir>${project.basedir}/src/main/docker</contextDir>
                     <assembly>
-                        <descriptorRef>artifact-with-dependencies</descriptorRef>
+                      <descriptorRef>artifact-with-dependencies</descriptorRef>
                     </assembly>
+                    <args>
+                      <BUILD_NAME>${project.name}</BUILD_NAME>
+                      <BUILD_VERSION>${project.version}</BUILD_VERSION>
+                 </args>
                   </build>
                 </image>
               </images>
diff --git a/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile b/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile
index 943658d9..2cc096bb 100644
--- a/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile
+++ b/tutorials/tutorial-xacml-application/src/main/docker/Dockerfile
@@ -1,6 +1,14 @@
-FROM onap/policy-xacml-pdp:2.7.0-SNAPSHOT
+ARG BUILD_VERSION=${BUILD_VERSION}
 
-ADD maven/${project.build.finalName}.jar /opt/app/policy/pdpx/lib/${project.build.finalName}.jar
+FROM onap/policy-xacml-pdp:${BUILD_VERSION}
+
+ARG BUILD_NAME=${BUILD_NAME}
+ARG BUILD_VERSION=${BUILD_VERSION}
+
+ENV BUILD_NAME $BUILD_NAME
+ENV BUILD_VERSION $BUILD_VERSION
+
+ADD maven/$BUILD_NAME-$BUILD_VERSION.jar /opt/app/policy/pdpx/lib/$BUILD_NAME-$BUILD_VERSION.jar
 
 RUN mkdir -p /opt/app/policy/pdpx/apps/tutorial
 
-- 
cgit 1.2.3-korg