Merge "Add proxy support"

diff --git a/installation/ubuntu/src/main/docker/Dockerfile b/installation/ubuntu/src/main/docker/Dockerfile
index 5d5b1b8..7d8e6eb 100644 (file)
--- a/installation/ubuntu/src/main/docker/Dockerfile
+++ b/installation/ubuntu/src/main/docker/Dockerfile
@@ -1,7 +1,15 @@
 # Base ubuntu with added packages needed for open ecomp
 FROM ubuntu:16.04
 MAINTAINER SDN-C Team (sdnc@lists.openecomp.org)
-# Set proxy if needed
-# RUN echo 'Acquire::http::Proxy "http://your.proxy.com:8080";' > /etc/apt/apt.conf
+
+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 tools needed for OpenDaylight
 RUN apt-get update && apt-get install -y git openjdk-8-jdk maven mysql-client nodejs nodejs-legacy python-pip graphviz npm unzip