Add proxy support in DockerFile.

This helps to build Policy-os docker image behind a proxy.

Change-Id: Ia31021249108544bfeba0087060dc32b68ff8844
Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>

diff --git a/docker_build.sh b/docker_build.sh
index 4b0233c..746f710 100755 (executable)
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -5,6 +5,16 @@ DOCKER_REPOSITORY=nexus3.onap.org:10003
 MVN_VERSION=$(cat target/version)
 MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . target/version)
 TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
+HTTP_PROXY=""
+HTTPS_PROXY=""
+PROXY_ARGS=""
+
+if [ $HTTP_PROXY ]; then
+    PROXY_ARGS+="--build-arg HTTP_PROXY=${HTTP_PROXY}"
+fi
+if [ $HTTPS_PROXY ]; then
+    PROXY_ARGS+="--build-arg HTTPS_PROXY=${HTTPS_PROXY}"
+fi
 
 echo $DOCKER_REPOSITORY
 echo $MVN_VERSION
@@ -59,7 +69,7 @@ for image in policy-os policy-nexus policy-db policy-base policy-drools policy-p
 
     echo $TAGS
 
-    docker build --quiet $TAGS target/$image
+    docker build --quiet ${PROXY_ARGS} $TAGS target/$image
 
     if [ $? -ne 0 ]
     then

diff --git a/policy-os/Dockerfile b/policy-os/Dockerfile
index 92fd057..30d5277 100644 (file)
--- a/policy-os/Dockerfile
+++ b/policy-os/Dockerfile
@@ -1,5 +1,11 @@
 FROM ubuntu:14.04
 
+ARG HTTP_PROXY=${HTTP_PROXY}
+ARG HTTPS_PROXY=${HTTPS_PROXY}
+
+ENV http_proxy $HTTP_PROXY
+ENV https_proxy $HTTPS_PROXY
+
 RUN \
        apt-get clean && \
        apt-get update && \