summaryrefslogtreecommitdiffstats
path: root/newton/docker/build-image.sh
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2017-09-11 11:25:12 +0800
committerBin Yang <bin.yang@windriver.com>2017-09-11 11:25:12 +0800
commitf2c5615c967a37c3d778bb9cf0a5a6706c17fa63 (patch)
tree7d53fb68706b513b2eb189c0e86179f5fbf32194 /newton/docker/build-image.sh
parent9be6dfbd7c81d017865a5eccacdcedb184ef6e50 (diff)
Fix bugs in restcall
fix bug and update dockerfile Change-Id: I5e6e2eeae85d9bfaabd190d8f9baaca8cca7aeb5 Issue-Id: MULTICLOUD-58 Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'newton/docker/build-image.sh')
-rwxr-xr-x[-rw-r--r--]newton/docker/build-image.sh32
1 files changed, 29 insertions, 3 deletions
diff --git a/newton/docker/build-image.sh b/newton/docker/build-image.sh
index 8d5fe479..fd8fb8cd 100644..100755
--- a/newton/docker/build-image.sh
+++ b/newton/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-openstack-newton"
-VERSION="latest"
+BUILD_ARGS="--no-cache"
+ORG="onap"
+VERSION="1.0.0-SNAPSHOT"
+PROJECT="multicloud"
+IMAGE="openstack-newton"
+DOCKER_REPOSITORY="nexus3.onap.org:10003"
+IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
-docker build -t ${IMAGE}:${VERSION} .
+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