From: liamfallon <liam.fallon@est.tech>
Date: Mon, 19 Apr 2021 13:10:43 +0000 (+0100)
Subject: Make base image name a property
X-Git-Tag: 2.3.0~43
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F38%2F120638%2F2;p=policy%2Fdocker.git

Make base image name a property

The base image name is not configurable for Policy builds. This change
makes the base image name configurable so it can be reconfigured if
needs be.

Issue-ID: POLICY-2971
Change-Id: I8ba39aa109c5b4ddb516c27f65bf20dc1020d220
Signed-off-by: liamfallon <liam.fallon@est.tech>
---

diff --git a/policy-jdk/alpine/pom.xml b/policy-jdk/alpine/pom.xml
index 0964f24b..c89cd7d6 100644
--- a/policy-jdk/alpine/pom.xml
+++ b/policy-jdk/alpine/pom.xml
@@ -35,6 +35,10 @@
     <name>Policy alpine jdk docker image</name>
     <description>Policy alpine jdk docker image</description>
 
+    <properties>
+        <docker.jdk.imagename>onap/policy-jdk-alpine</docker.jdk.imagename>
+    </properties>
+
     <build>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
@@ -79,7 +83,7 @@
                     <pushRegistry>${docker.push.registry}</pushRegistry>
                     <images>
                         <image>
-                            <name>onap/policy-jdk-alpine</name>
+                            <name>${docker.jdk.imagename}</name>
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFile>Dockerfile</dockerFile>
@@ -121,7 +125,7 @@
                             <goal>push</goal>
                         </goals>
                         <configuration>
-                            <image>onap/policy-jdk-alpine</image>
+                            <image>${docker.jdk.imagename}</image>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/policy-jre/alpine/pom.xml b/policy-jre/alpine/pom.xml
index c32eafad..21322097 100644
--- a/policy-jre/alpine/pom.xml
+++ b/policy-jre/alpine/pom.xml
@@ -35,6 +35,10 @@
     <name>Policy alpine jre docker image</name>
     <description>Policy alpine jre docker image</description>
 
+    <properties>
+        <docker.jre.imagename>onap/policy-jre-alpine</docker.jre.imagename>
+    </properties>
+
     <build>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
@@ -79,7 +83,7 @@
                     <pushRegistry>${docker.push.registry}</pushRegistry>
                     <images>
                         <image>
-                            <name>onap/policy-jre-alpine</name>
+                            <name>${docker.jre.imagename}</name>
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFile>Dockerfile</dockerFile>
@@ -121,7 +125,7 @@
                             <goal>push</goal>
                         </goals>
                         <configuration>
-                            <image>onap/policy-jre-alpine</image>
+                            <image>${docker.jre.imagename}</image>
                         </configuration>
                     </execution>
                 </executions>