From: Areli Fuss <af732p@att.com>
Date: Tue, 7 Nov 2017 14:30:48 +0000 (+0200)
Subject: Add http_proxy definitions
X-Git-Tag: 2.0.0-ONAP~13
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=90e2d3cd6d015fc0f74a7d0bb063788264def860;p=vvp%2Fgitlab.git

Add http_proxy definitions

Add http_proxy definitions

Change-Id: I379b330f5939537554a46ff8300ce802aa7be157
Issue-Id: VVP-25
Signed-off-by: Areli Fuss <af732p@att.com>
---

diff --git a/Dockerfile b/Dockerfile
index 532c62a..0dfbb00 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,8 +65,18 @@ RUN apt-key list
 
 #TEST
 RUN echo "####### TEST START #########"
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
+
+ENV HTTP_PROXY  ${HTTP_PROXY}
+ENV HTTPS_PROXY ${HTTPS_PROXY}
+
+RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy  \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \
+    if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
+
 ADD https://packages.gitlab.com/login ttt
 RUN curl https://packages.gitlab.com/login
+
 RUN echo "####### TEST END #########"
 
 
diff --git a/pom.xml b/pom.xml
index b0f8fc4..79318b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,9 @@
         <!--docker-->
         <docker.tag>${project.version}-${timestamp}</docker.tag>
         <docker.latest.tag>${project.version}-latest</docker.latest.tag>
+        <!--  docker.buildArg.https_proxy>${env.HTTPS_PROXY}</docker.buildArg.https_proxy -->
+        <docker.buildArg.https_proxy>https://165.227.53.107:3128</docker.buildArg.https_proxy>
+        <docker.buildArg.http_proxy>http://35.196.90.170:80</docker.buildArg.http_proxy>
   </properties>
 
   <build>