From 6e36eec11cef53beeaa7dffbd7af83ee0ab1b139 Mon Sep 17 00:00:00 2001 From: Shashank Kumar Shankar Date: Thu, 29 Jun 2017 12:52:59 -0700 Subject: [POLICY-54] Add proxy for docker builds and fixes This patch helps to build Policy docker images behind a proxy and fixes the following correction in patch https://gerrit.onap.org/r/#/c/5585/ : 1. $HTTP_PROXY and $HTTPS_PROXY environment variables gets reset with HTTP_PROXY="" and HTTP_PROXY="" overriding it. 2. When both $HTTP_PROXY and $HTTPS_PROXY are set, a space is needed when they are appended for providing correct arguments to docker build command. Change-Id: I1d0f2003c77444e372b754d42f20d2e428e70a95 Signed-off-by: Shashank Kumar Shankar --- docker_verify.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'docker_verify.sh') diff --git a/docker_verify.sh b/docker_verify.sh index cdb42e9d..17eff0a1 100755 --- a/docker_verify.sh +++ b/docker_verify.sh @@ -8,6 +8,14 @@ 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) +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 @@ -58,7 +66,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 -- cgit