From: RehanRaza <muhammad.rehan.raza@est.tech>
Date: Wed, 8 Jan 2020 08:34:07 +0000 (+0100)
Subject: Fix Jenkins staging job using JAR args in pom
X-Git-Tag: 1.0.1~52
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=9d0abfec77a4a040a3e5c86fe4f5a24a4847ebb9;p=nonrtric.git

Fix Jenkins staging job using JAR args in pom

Change-Id: If7bc4e8270a6508ff23f2b59dc9330430f9a627d
Issue-ID: NONRTRIC-79
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
---

diff --git a/policy-agent/Dockerfile b/policy-agent/Dockerfile
index 1c5f2105..d0ddd40c 100644
--- a/policy-agent/Dockerfile
+++ b/policy-agent/Dockerfile
@@ -19,6 +19,8 @@
 #
 FROM openjdk:11-jre-slim
 
+ARG JAR
+
 WORKDIR /opt/app/policy-agent
 RUN mkdir -p /var/log/policy-agent
 RUN mkdir -p /opt/app/policy-agent/etc/cert/
@@ -26,12 +28,12 @@ RUN mkdir -p /opt/app/policy-agent/etc/cert/
 EXPOSE 8081
 
 ADD /config/application.yaml /opt/app/policy-agent/config/
-ADD target/policy-agent-1.0.0-SNAPSHOT.jar /opt/app/policy-agent/
+ADD target/${JAR} /opt/app/policy-agent/policy-agent.jar
 
 
 RUN chmod -R 777 /opt/app/policy-agent/config/
 
-CMD ["java", "-jar", "/opt/app/policy-agent/policy-agent-1.0.0-SNAPSHOT.jar"]
+CMD ["java", "-jar", "/opt/app/policy-agent/policy-agent.jar"]
 
 
 
diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml
index bb6cdb74..3638dff6 100644
--- a/policy-agent/pom.xml
+++ b/policy-agent/pom.xml
@@ -251,6 +251,9 @@
                                         <cleanup>try</cleanup>
                                         <contextDir>${basedir}</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
+                                        <args>
+                                            <JAR>${project.build.finalName}.jar</JAR>
+                                        </args>
                                         <tags>
                                             <tag>${project.version}</tag>
                                         </tags>
@@ -274,6 +277,9 @@
                                     <build>
                                         <contextDir>${basedir}</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
+                                        <args>
+                                            <JAR>${project.build.finalName}.jar</JAR>
+                                        </args>
                                         <tags>
                                             <tag>${project.version}</tag>
                                         </tags>