From: barak <barak.dabush@amdocs.com>
Date: Mon, 26 Jun 2017 23:45:02 +0000 (+0300)
Subject: [OOM-2] Replaced static proxy with env
X-Git-Tag: 2.0.0-ONAP~759
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=131c2a42541fb807f395fe1f39a8482a53f92c60;p=oom.git

[OOM-2] Replaced static proxy with env

Change-Id: Id2b640f9cfa58337e94d26b4f0939a33db45a137
Signed-off-by: barak <barak.dabush@amdocs.com>
---

diff --git a/kubernetes/portal/docker/init/mariadb-client/Dockerfile b/kubernetes/portal/docker/init/mariadb-client/Dockerfile
index 416633a7ee..3089bafcfd 100644
--- a/kubernetes/portal/docker/init/mariadb-client/Dockerfile
+++ b/kubernetes/portal/docker/init/mariadb-client/Dockerfile
@@ -2,8 +2,8 @@ FROM ubuntu:16.04
 
 ENV no_proxy "localhost,127.0.0.1,.cluster.local,$KUBERNETES_SERVICE_HOST"
 # Setup Corporate proxy
-ENV https_proxy http://genproxy.amdocs.com:8080/
-ENV http_proxy http://genproxy.amdocs.com:8080/
+ENV https_proxy ${HTTP_PROXY}
+ENV http_proxy ${HTTPS_PROXY}
 
 RUN apt-get update
 RUN apt-get install -y mariadb-client-10.0
diff --git a/kubernetes/portal/docker/init/ubuntu/Dockerfile b/kubernetes/portal/docker/init/ubuntu/Dockerfile
index f4a8d55831..779a7fa921 100644
--- a/kubernetes/portal/docker/init/ubuntu/Dockerfile
+++ b/kubernetes/portal/docker/init/ubuntu/Dockerfile
@@ -2,8 +2,8 @@ FROM ubuntu:16.04
 
 ENV no_proxy "localhost,127.0.0.1,.cluster.local,$KUBERNETES_SERVICE_HOST"
 # Setup Corporate proxy
-ENV https_proxy http://genproxy.amdocs.com:8080/
-ENV http_proxy http://genproxy.amdocs.com:8080/
+ENV https_proxy ${HTTPS_PROXY}
+ENV http_proxy ${HTTP_PROXY}
 
 RUN apt-get update
 RUN apt-get install -y host dnsutils
diff --git a/kubernetes/readiness/docker/init/Dockerfile b/kubernetes/readiness/docker/init/Dockerfile
index b0fd68b44e..20f2268975 100644
--- a/kubernetes/readiness/docker/init/Dockerfile
+++ b/kubernetes/readiness/docker/init/Dockerfile
@@ -2,8 +2,8 @@ from ubuntu:16.04
 
 ENV no_proxy "localhost,127.0.0.1,.cluster.local,$KUBERNETES_SERVICE_HOST"
 # Setup Corporate proxy
-ENV https_proxy http://genproxy.amdocs.com:8080/
-ENV http_proxy http://genproxy.amdocs.com:8080/
+ENV https_proxy ${HTTPS_PROXY}
+ENV http_proxy ${HTTP_PROXY}
 
 # Additional packages
 RUN apt-get update