Allow setting external dockerfiles for clamp

Added maven properties to allow overriding each dockerfile during build,
for example:
 mvn clean install -Pdocker \
   -Ddocker.clamp-runtime.dockerFile=/path/to/Dockerfile

Issue-ID: POLICY-4334
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I648b83b53cb65a9b6fc762af715ec1b959792992

diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml
index cd9cb17..54bf1b0 100644 (file)
--- a/packages/policy-clamp-docker/pom.xml
+++ b/packages/policy-clamp-docker/pom.xml
@@ -43,6 +43,16 @@
         <docker.skip.push>false</docker.skip.push>
         <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
         <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+        <docker.clamp-runtime-acm.dockerFile>AcmRuntime.Dockerfile</docker.clamp-runtime-acm.dockerFile>
+        <docker.clamp-runtime-acm.contextDir>${project.basedir}/src/main/docker</docker.clamp-runtime-acm.contextDir>
+        <docker.clamp-ac-pf-ppnt.dockerFile>PolicyParticipant.Dockerfile</docker.clamp-ac-pf-ppnt.dockerFile>
+        <docker.clamp-ac-pf-ppnt.contextDir>${project.basedir}/src/main/docker</docker.clamp-ac-pf-ppnt.contextDir>
+        <docker.clamp-ac-k8s-ppnt.dockerFile>KubernetesParticipant.Dockerfile</docker.clamp-ac-k8s-ppnt.dockerFile>
+        <docker.clamp-ac-k8s-ppnt.contextDir>${project.basedir}/src/main/docker</docker.clamp-ac-k8s-ppnt.contextDir>
+        <docker.clamp-ac-http-ppnt.dockerFile>HttpParticipant.Dockerfile</docker.clamp-ac-http-ppnt.dockerFile>
+        <docker.clamp-ac-http-ppnt.contextDir>${project.basedir}/src/main/docker</docker.clamp-ac-http-ppnt.contextDir>
+        <docker.clamp-acm-element-impl.dockerFile>ElementParticipant.Dockerfile</docker.clamp-acm-element-impl.dockerFile>
+        <docker.clamp-acm-element-impl.contextDir>${project.basedir}/src/main/docker</docker.clamp-acm-element-impl.contextDir>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
     </properties>
 
@@ -105,7 +115,8 @@
                             <name>onap/policy-clamp-runtime-acm</name>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFile>AcmRuntime${dockerFileFlavor}.Dockerfile</dockerFile>
+                                <dockerFile>${docker.clamp-runtime-acm.dockerFile}</dockerFile>
+                                <contextDir>${docker.clamp-runtime-acm.contextDir}</contextDir>
                                 <tags>
                                     <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -137,7 +148,8 @@
                             <alias>onap-policy-clamp-ac-pf-ppnt</alias>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFile>PolicyParticipant${dockerFileFlavor}.Dockerfile</dockerFile>
+                                <dockerFile>${docker.clamp-ac-pf-ppnt.dockerFile}</dockerFile>
+                                <contextDir>${docker.clamp-ac-pf-ppnt.contextDir}</contextDir>
                                 <tags>
                                     <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -169,7 +181,8 @@
                             <alias>onap-policy-clamp-ac-k8s-ppnt</alias>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFile>KubernetesParticipant${dockerFileFlavor}.Dockerfile</dockerFile>
+                                <dockerFile>${docker.clamp-ac-k8s-ppnt.dockerFile}</dockerFile>
+                                <contextDir>${docker.clamp-ac-k8s-ppnt.contextDir}</contextDir>
                                 <tags>
                                     <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -201,7 +214,8 @@
                             <alias>onap-policy-clamp-ac-http-ppnt</alias>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFile>HttpParticipant${dockerFileFlavor}.Dockerfile</dockerFile>
+                                <dockerFile>${docker.clamp-ac-http-ppnt.dockerFile}</dockerFile>
+                                <contextDir>${docker.clamp-ac-http-ppnt.contextDir}</contextDir>
                                 <tags>
                                     <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -233,7 +247,8 @@
                             <alias>onap-policy-clamp-acm-element-impl</alias>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFile>ElementParticipant${dockerFileFlavor}.Dockerfile</dockerFile>
+                                <dockerFile>${docker.clamp-acm-element-impl.dockerFile}</dockerFile>
+                                <contextDir>${docker.clamp-acm-element-impl.contextDir}</contextDir>
                                 <tags>
                                     <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>

diff --git a/packages/pom.xml b/packages/pom.xml
index edac17e..f96c531 100644 (file)
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -54,7 +54,6 @@
             </modules>
             <properties>
                 <docker.skip.push>false</docker.skip.push>
-                <dockerFileFlavor/>
             </properties>
         </profile>
         <profile>
@@ -65,7 +64,11 @@
             </modules>
             <properties>
                 <docker.skip.push>false</docker.skip.push>
-                <dockerFileFlavor>-Suse</dockerFileFlavor>
+                <docker.clamp-runtime-acm.dockerFile>AcmRuntime-Suse.Dockerfile</docker.clamp-runtime-acm.dockerFile>
+                <docker.clamp-ac-pf-ppnt.dockerFile>PolicyParticipant-Suse.Dockerfile</docker.clamp-ac-pf-ppnt.dockerFile>
+                <docker.clamp-ac-k8s-ppnt.dockerFile>KubernetesParticipant-Suse.Dockerfile</docker.clamp-ac-k8s-ppnt.dockerFile>
+                <docker.clamp-ac-http-ppnt.dockerFile>HttpParticipant-Suse.Dockerfile</docker.clamp-ac-http-ppnt.dockerFile>
+                <docker.clamp-acm-element-impl.dockerFile>ElementParticipant-Suse.Dockerfile</docker.clamp-acm-element-impl.dockerFile>
             </properties>
         </profile>
     </profiles>

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 0487148..0d8afb1 100644 (file)
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -84,6 +84,8 @@
         <docker.skip.build>true</docker.skip.build>
         <docker.skip.push>true</docker.skip.push>
         <docker.skip.tag>true</docker.skip.tag>
+        <docker.clamp-runtime.dockerFile>backend/Dockerfile</docker.clamp-runtime.dockerFile>
+        <docker.clamp-runtime.contextDir>${project.basedir}/src/main/docker</docker.clamp-runtime.contextDir>
         <skip.staging.artifacts>false</skip.staging.artifacts>
         <python.http.proxy.param />
 
@@ -141,7 +143,6 @@
                 <docker.skip.tag>false</docker.skip.tag>
                 <docker.skip.push>false</docker.skip.push>
                 <docker.skip>false</docker.skip>
-                <dockerFile>backend/Dockerfile</dockerFile>
             </properties>
         </profile>
         <profile>
@@ -152,7 +153,7 @@
                 <docker.skip.tag>false</docker.skip.tag>
                 <docker.skip.push>false</docker.skip.push>
                 <docker.skip>false</docker.skip>
-                <dockerFile>backend/suse.Dockerfile</dockerFile>
+                <docker.clamp-runtime.dockerFile>backend/suse.Dockerfile</docker.clamp-runtime.dockerFile>
             </properties>
         </profile>
     </profiles>
@@ -769,9 +770,8 @@
                                     <tag>${project.docker.latesttagtimestamp.version}</tag>
                                     <tag>${project.docker.latesttag.version}</tag>
                                 </tags>
-                                <!-- A relative path is looked up in ${project.basedir}/src/main/docker by
-                                    default -->
-                                <dockerFile>${dockerFile}</dockerFile>
+                                <dockerFile>${docker.clamp-runtime.dockerFile}</dockerFile>
+                                <contextDir>${docker.clamp-runtime.contextDir}</contextDir>
                                 <assembly>
                                     <descriptor>backend/backend-files.xml</descriptor>
                                     <name>onap-policy-clamp-backend</name>