From cea8d3ee9628be96730b8473813cbbd7ca9360dd Mon Sep 17 00:00:00 2001
From: "Kotagiri, Ramprasad (rp5662)" <rp5662@att.com>
Date: Tue, 2 Apr 2019 10:16:51 -0400
Subject: Update POM for maven dockerfile plugin push target

This update addresses the issue for docker push.
dockerfile-maven-plugin configuration expects the docker login
credentials to be present in the maven settings file.
<servers>
<server><id>nexus3.onap.org:10003</id><username></username><password></password></server>
</servers>

Issue-ID: CCSDK-1011
Change-Id: I8a700336805e997f3094d87f8e10756258fe96fa
Signed-off-by: ramprasad kotagiri <rp5662@att.com>
---
 ccsdk-app-os/pom.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'ccsdk-app-os/pom.xml')

diff --git a/ccsdk-app-os/pom.xml b/ccsdk-app-os/pom.xml
index 8b53301..7744dda 100644
--- a/ccsdk-app-os/pom.xml
+++ b/ccsdk-app-os/pom.xml
@@ -30,7 +30,9 @@
 		<build.version>${project.version}</build.version>
 		<!-- Tests usually require some setup that maven cannot do, so skip. -->
 		<skiptests>true</skiptests>
-		<docker.image.name>onap/org.onap.ccsdk.dashboard</docker.image.name>
+		<docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name>
+		<docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+		<image-name>${docker.push.registry}/${docker.image.name}</image-name>
 	</properties>
 
 	<repositories>
@@ -53,7 +55,6 @@
 			<url>${nexusproxy}${stagingNexusPath}</url>
 		</repository>
 	</repositories>
-
 	<build>
 
 		<!-- War files are labeled with build information, not POM version -->
@@ -123,6 +124,15 @@
 				<groupId>com.spotify</groupId>
 				<artifactId>dockerfile-maven-plugin</artifactId>
 				<version>1.4.10</version>
+				<configuration>
+					<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+					<repository>${image-name}</repository>
+        			<tag>latest</tag>
+        			<dockerfile>Dockerfile</dockerfile>
+        			<buildArgs>
+            			<WAR_FILE>${project.build.finalName}.war</WAR_FILE>
+        			</buildArgs>
+    			</configuration>
 				  <executions>
 				    <execution>
 				      <id>default</id>
@@ -132,16 +142,6 @@
 				      </goals>
 				    </execution>
 				  </executions>
-				  <configuration>
-				  	<googleContainerRegistryEnabled>false</googleContainerRegistryEnabled>
-				  	<repository>${onap.nexus.dockerregistry.daily}</repository>
-				  	<dockerfile>Dockerfile</dockerfile>
-				    <repository>${docker.image.name}</repository>
-				    <tag>latest</tag>
-				    <buildArgs>
-				      <WAR_FILE>${project.build.finalName}.war</WAR_FILE>
-				    </buildArgs>
-				  </configuration>
 			</plugin>
 			<!-- no deployment needed -->
 			<plugin>
-- 
cgit 1.2.3-korg