From 3ad277569c8966442d8b56c4ca6ccc4efd40acd7 Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Mon, 30 Apr 2018 17:24:44 -0500 Subject: 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 --- docker_build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'docker_build.sh') diff --git a/docker_build.sh b/docker_build.sh index 6f00f7e8..6f680584 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -19,14 +19,15 @@ 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 @@ -76,7 +77,7 @@ TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/${IMAGE}:${MVN_VERSION}-STAGING-${ 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 -- cgit 1.2.3-korg