diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2019-03-04 16:11:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-04 16:11:12 +0000 |
| commit | c10a9c1fea3a7c05eb4b4aaf2264855222f1945b (patch) | |
| tree | 509d91a93094d68fc5f394dd539de5026a15bfe7 /docker_merge.sh | |
| parent | 5ac447f758d9b7a7baaf0e24a0e8621a15b8c5ff (diff) | |
| parent | b001c1ac5a0b4d938a69adb47f4613f64dc71c1a (diff) | |
Merge "move all hard install config to environment vars"
Diffstat (limited to 'docker_merge.sh')
| -rw-r--r-- | docker_merge.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docker_merge.sh b/docker_merge.sh index 20fa184c..3cbef595 100644 --- a/docker_merge.sh +++ b/docker_merge.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,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 |