Merge "move all hard install config to environment vars"

[policy/drools-pdp.git] / docker_verify.sh

diff --git a/docker_verify.sh b/docker_verify.sh
index 009fce4..e2fbe27 100644 (file)
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 AT&T Intellectual Property. All rights reserved
+# Copyright 2018-2019 AT&T Intellectual Property. All rights reserved
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,16 +22,9 @@ DOCKER_REPOSITORY=nexus3.onap.org:10003
 MVN_VERSION=$(cat packages/docker/target/version)
 MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . packages/docker/target/version)
 TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
-PROXY_ARGS=""
+BUILD_ARGS="--build-arg BUILD_VERSION=${MVN_VERSION}"
 IMAGE=policy-drools
 
-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
 echo $MVN_MAJMIN_VERSION
@@ -75,7 +68,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-${TIMESTAM
 
 echo $TAGS
 
-docker build --quiet ${PROXY_ARGS} $TAGS packages/docker/target/$IMAGE
+docker build --quiet ${BUILD_ARGS} $TAGS packages/docker/target/$IMAGE
 
 if [ $? -ne 0 ]
 then