diff options
| author |   Jorge Hernandez <jh1730@att.com> | 2018-04-30 17:24:44 -0500 |
|---|---|---|
| committer | Jorge Hernandez <jh1730@att.com> | 2018-04-30 20:29:33 -0500 |
| commit | 3ad277569c8966442d8b56c4ca6ccc4efd40acd7 (patch) | |
| tree | 3a8ed54e8c88443bbdaa401ab1392c8bb11d07aa /docker_merge.sh | |
| parent | 43d1d7f7769f88236364c982e13d76cc6cbc26db (diff) | |
Make custom preinstallation available in image
This script could be used by OOM installation to
trigger the installation of a drools application
or other purposes (ie. control loop)
Change-Id: Iafdb413ee85aa341351481584e8c967cc1a3c112
Issue-ID: POLICY-566
Signed-off-by: Jorge Hernandez <jh1730@att.com>
Diffstat (limited to 'docker_merge.sh')
| -rw-r--r-- | docker_merge.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker_merge.sh b/docker_merge.sh index 804ea854..20fa184c 100644 --- a/docker_merge.sh +++ b/docker_merge.sh @@ -19,14 +19,14 @@ 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}" + BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" fi if [ $HTTPS_PROXY ]; then - PROXY_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" + BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" fi echo $DOCKER_REPOSITORY @@ -72,7 +72,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 |