summaryrefslogtreecommitdiffstats
path: root/docker_verify.sh
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2018-05-07 18:22:12 -0500
committerJorge Hernandez <jh1730@att.com>2018-05-07 18:22:12 -0500
commit973929cfd6cd3e5ba3a837fa56d35b210307c9ac (patch)
tree46e2eda34ba87704f9b8250f672286b09c271dd3 /docker_verify.sh
parentfad662d64ab3cb3aa2969fbcb9d7ff14cc1f15f1 (diff)
automate dependency.json version population
This avoids error-prone manual version changes to configuration files. Change-Id: I1a991ef9a8eb4cc7dd5fe26d9952286d8b5c0115 Issue-ID: POLICY-766 Signed-off-by: Jorge Hernandez <jh1730@att.com>
Diffstat (limited to 'docker_verify.sh')
-rw-r--r--docker_verify.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/docker_verify.sh b/docker_verify.sh
index 428efece8..11e2fefd2 100644
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -28,14 +28,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-pe
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
@@ -81,7 +81,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