summaryrefslogtreecommitdiffstats
path: root/multivimbroker/docker
diff options
context:
space:
mode:
authorEthan Lynn <ethanlynnl@vmware.com>2017-09-07 17:48:06 +0800
committerEthan Lynn <ethanlynnl@vmware.com>2017-09-07 17:50:23 +0800
commitb1940de09a25868555ef61c401e454dc35b6b2d5 (patch)
tree9ea7dd1ed163226ea0833a4fe846930d6e9900a4 /multivimbroker/docker
parentc763387cf77eef9e5a9def4b46d6260dd5aa1766 (diff)
Update build_image.sh
In order to integrate with CI docker build job, update related scripts. Change-Id: I6d456c5bff5e5917fa1741e5a9d533ba0463d97e issue-id: MULTICLOUD-73 Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>
Diffstat (limited to 'multivimbroker/docker')
-rw-r--r--multivimbroker/docker/build-image.sh32
1 files changed, 29 insertions, 3 deletions
diff --git a/multivimbroker/docker/build-image.sh b/multivimbroker/docker/build-image.sh
index b6f4dd4..73a8db6 100644
--- a/multivimbroker/docker/build-image.sh
+++ b/multivimbroker/docker/build-image.sh
@@ -1,6 +1,32 @@
#!/bin/bash
+DIRNAME=`dirname $0`
+DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
+echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
+cd ${DOCKER_BUILD_DIR}
-IMAGE="multicloud-framework"
-VERSION="latest"
+BUILD_ARGS="--no-cache"
+ORG="onap"
+VERSION="1.0.0-SNAPSHOT"
+PROJECT="multicloud"
+IMAGE="framework"
+DOCKER_REPOSITORY="nexus3.onap.org:10003"
+IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
-docker build -t ${IMAGE}:${VERSION} . \ No newline at end of file
+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
+
+function build_image {
+ docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+}
+
+function push_image {
+ docker push ${IMAGE_NAME}:${VERSION}
+ docker push ${IMAGE_NAME}:latest
+}
+
+build_image
+push_image \ No newline at end of file