From ba532fb0fdd23dd44f51839d62edb89b66696f49 Mon Sep 17 00:00:00 2001
From: "saul.gill" <saul.gill@est.tech>
Date: Tue, 6 Dec 2022 15:27:11 +0000
Subject: Fix dockersuse profile

Addition of mvn properties to make Dockerfile configurable
caused ignoring of dockersuse properties.
Removed overriding properties and manually tested.
Added dockerfile names to docker profile too.

Issue-ID: POLICY-4473
Change-Id: Ic7432524127500c7533d0d72172027142de1ee4c
Signed-off-by: saul.gill <saul.gill@est.tech>
---
 packages/policy-clamp-docker/pom.xml                         | 12 ------------
 .../src/main/docker/A1pmsParticipant-Suse.Dockerfile         |  2 +-
 packages/pom.xml                                             |  6 ++++++
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml
index 4c000508e..c8d837f44 100644
--- a/packages/policy-clamp-docker/pom.xml
+++ b/packages/policy-clamp-docker/pom.xml
@@ -43,18 +43,6 @@
         <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-ac-a1pms-ppnt.dockerFile>A1pmsParticipant.Dockerfile</docker.clamp-ac-a1pms-ppnt.dockerFile>
-        <docker.clamp-ac-a1pms-ppnt.contextDir>${project.basedir}/src/main/docker</docker.clamp-ac-a1pms-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>
 
diff --git a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant-Suse.Dockerfile b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant-Suse.Dockerfile
index 33d66da46..a03f26286 100755
--- a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant-Suse.Dockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant-Suse.Dockerfile
@@ -53,7 +53,7 @@ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME
 
 WORKDIR $POLICY_HOME
 COPY --chown=policy:policy a1pms-participant.sh bin/
-COPY --chown=policy:policy /maven/policy-clamp-participant-impl-a1.jar /app/app.jar
+COPY --chown=policy:policy /maven/policy-clamp-participant-impl-a1pms.jar /app/app.jar
 
 RUN chmod 755 bin/*.sh
 
diff --git a/packages/pom.xml b/packages/pom.xml
index 56f997455..41463a1d0 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -54,6 +54,12 @@
             </modules>
             <properties>
                 <docker.skip.push>false</docker.skip.push>
+                <docker.clamp-runtime-acm.dockerFile>AcmRuntime.Dockerfile</docker.clamp-runtime-acm.dockerFile>
+                <docker.clamp-ac-pf-ppnt.dockerFile>PolicyParticipant.Dockerfile</docker.clamp-ac-pf-ppnt.dockerFile>
+                <docker.clamp-ac-k8s-ppnt.dockerFile>KubernetesParticipant.Dockerfile</docker.clamp-ac-k8s-ppnt.dockerFile>
+                <docker.clamp-ac-http-ppnt.dockerFile>HttpParticipant.Dockerfile</docker.clamp-ac-http-ppnt.dockerFile>
+                <docker.clamp-ac-a1pms-ppnt.dockerFile>A1pmsParticipant.Dockerfile</docker.clamp-ac-a1pms-ppnt.dockerFile>
+                <docker.clamp-acm-element-impl.dockerFile>ElementParticipant.Dockerfile</docker.clamp-acm-element-impl.dockerFile>
             </properties>
         </profile>
         <profile>
-- 
cgit 1.2.3-korg