diff options
| author |   Jorge Hernandez <jorge.hernandez-herrero@att.com> | 2019-02-28 10:10:49 -0600 |
|---|---|---|
| committer | Jorge Hernandez <jorge.hernandez-herrero@att.com> | 2019-03-01 09:56:11 -0600 |
| commit | b001c1ac5a0b4d938a69adb47f4613f64dc71c1a (patch) | |
| tree | a83c2887edc25fd4eb24f3f6d485e8f860069c19 /docker_merge.sh | |
| parent | 8e9ddde1bb1e3fc3f7b85af653d6251daf7e77d6 (diff) | |
move all hard install config to environment vars
+ support multiple system properties files with variable interpolation
loaded at initialization
+ support of configurable JVM options (-X, etc ..).
+ rearrange aaf configuration to avoid {{}} installation variables
and use dynamic enviroment variables.
+ miscellaneous clean up in areas touched and checkstyle.
Change-Id: I71ad839778e17eb57c098a2c5cc2bf96e468669a
Issue-ID: POLICY-1524
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
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 |