Merge "move all hard install config to environment vars"
[policy/drools-pdp.git] / docker_merge.sh
index 20fa184..3cbef59 100644 (file)
@@ -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,13 +22,6 @@ TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
 BUILD_ARGS="--build-arg BUILD_VERSION=${MVN_VERSION}"
 IMAGE=policy-drools
 
-if [ $HTTP_PROXY ]; then
-    BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
-fi
-if [ $HTTPS_PROXY ]; then
-    BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
-fi
-
 echo $DOCKER_REPOSITORY
 echo $MVN_VERSION
 echo $MVN_MAJMIN_VERSION