summaryrefslogtreecommitdiffstats
path: root/docker_merge.sh
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-05-01 12:33:19 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-01 12:33:19 +0000
commitd8941a17b30fdc6d24f1c5e9d84685c1fafd7ee6 (patch)
treeca58f8cc8ca6914d115e6d532cfa49371f88f123 /docker_merge.sh
parente24410b8466fd5286a2c47d4f4c97d8139f5ba9e (diff)
parent3ad277569c8966442d8b56c4ca6ccc4efd40acd7 (diff)
Merge "Make custom preinstallation available in image"
Diffstat (limited to 'docker_merge.sh')
-rw-r--r--docker_merge.sh8
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