From 05d1e18373779df333d1f1fa30cc4891a8da59a4 Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
Date: Fri, 26 Jul 2019 12:48:41 -0400
Subject: Cleanup POMs and Dockerfiles

Issue-ID: OPTFRA-539

Change-Id: I94da0bc947b4cbb226c5e248c85c8d87f799c659
Signed-off-by: Jerry Flood <jflood@att.com>
---
 cmso-database/pom.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'cmso-database/pom.xml')

diff --git a/cmso-database/pom.xml b/cmso-database/pom.xml
index dddd293..7c92055 100644
--- a/cmso-database/pom.xml
+++ b/cmso-database/pom.xml
@@ -55,8 +55,6 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		
-		<docker.push.registry>localhost:5000</docker.push.registry>
-		<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
 		<docker.skip.build>false</docker.skip.build>
 		<docker.skip.push>false</docker.skip.push>
 		<docker.skip.tag>false</docker.skip.tag>
@@ -147,7 +145,7 @@
 			                <apiVersion>1.23</apiVersion>
 			                <images>
 								<image>
-										<name>onap/optf-cmso-dbinit</name>
+										<name>${image.namespace}/optf-cmso-dbinit</name>
 										<alias>onap-optf-cmso-dbinit</alias>
 										<build>
 												<cleanup>true</cleanup>
@@ -161,6 +159,12 @@
 														<descriptor>${project.basedir}/src/main/docker/assembly/cmso-files.xml</descriptor>
 														<name>onap-cmso</name>
 												</assembly>
+												<args>
+													<!-- plugin cannot handle empty (no proxy) arguments
+													<http_proxy_arg>${docker.http_proxy}</http_proxy_arg>
+													<https_proxy_arg>${docker.https_proxy}</https_proxy_arg>
+													-->
+												</args>	
 										</build>
 								</image>
 			                </images>
@@ -181,7 +185,7 @@
 			                                <goal>push</goal>
 			                        </goals>
 			                        <configuration>
-			                                <image>onap/optf-cmso-dbinit:%l</image>
+			                                <image>${image.namespace}/optf-cmso-dbinit:%l</image>
 			                        </configuration>
 			                </execution>
 			        </executions>
-- 
cgit 1.2.3-korg