From 18702e090e6e7858a15cb071527149de74ed12b7 Mon Sep 17 00:00:00 2001
From: Avinash S <avinash.s@huawei.com>
Date: Thu, 8 Feb 2018 13:41:15 +0000
Subject: Proxy settings in pom without switch

Proxy settings in pom without switch seems to be causing
the npm download issues. Better set proxy settings in
settings.xml meanwhile. Removing these changes for now
to try fix docker build issue.
Issue-ID: VNFSDK-141

Change-Id: Iad8f311210a9555c614c8b14b878b4816430ad0c
Signed-off-by: Avinash S <avinash.s@huawei.com>
---
 vnfmarket-be/deployment/docker/docker-postgres/pom.xml | 5 -----
 vnfmarket-be/deployment/docker/docker-refrepo/pom.xml  | 7 +------
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'vnfmarket-be/deployment/docker')

diff --git a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
index ef01bc52..e4c8d5ab 100644
--- a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
@@ -67,11 +67,6 @@
                             </build>
                            </image>
                       </images>
-                      <buildArgs>
-         								<http_proxy>${HTTP_PROXY}</http_proxy>
-         								<https_proxy>${HTTPS_PROXY}</https_proxy>
-         								<no_proxy>localhost,127.0.0.1</no_proxy>
-    								</buildArgs>
                    </configuration>
                       <executions>
                            <execution>
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
index 3272d9f3..347ae06c 100644
--- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
@@ -45,7 +45,7 @@
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.4.11</version>
+                <version>1.0.0</version>
                 <configuration>
                     <verbose>true</verbose>
                     <imageName>onap/refrepo</imageName>
@@ -60,11 +60,6 @@
                             </includes>
                         </resource>
                     </resources>
-                     <buildArgs>
-         								<http_proxy>${HTTP_PROXY}</http_proxy>
-         								<https_proxy>${HTTPS_PROXY}</https_proxy>
-         								<no_proxy>localhost,127.0.0.1</no_proxy>
-    								</buildArgs>
                 </configuration>
                
                 <executions>                   
-- 
cgit 1.2.3-korg