diff options
| -rw-r--r-- | tutorials/tutorial-xacml-application/pom.xml | 6 | ||||
| -rw-r--r-- | tutorials/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 |