diff options
| author |   Bin Hu <bh526r@att.com> | 2018-05-17 02:52:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-17 02:52:31 +0000 |
| commit | d73ce67bc1bb04354ed91dd02ec620f2632ea97e (patch) | |
| tree | 0ed74021184626299e61909977c9828b362a0bf6 /ocata/docker/build_image.sh | |
| parent | 3845ce548fd240795c3f1680cafdf5e34ab422ed (diff) | |
| parent | eb60ad19e55a1ff53ca884d15c81f018ad7431cc (diff) | |
Merge "Add console logging output"
Diffstat (limited to 'ocata/docker/build_image.sh')
| -rw-r--r-- | ocata/docker/build_image.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh index c85989d0..8e55f89f 100644 --- a/ocata/docker/build_image.sh +++ b/ocata/docker/build_image.sh @@ -5,13 +5,9 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" -ORG="onap" VERSION="1.1.2-SNAPSHOT" STAGING="1.1.2-STAGING" -PROJECT="multicloud" -IMAGE="openstack-ocata" -DOCKER_REPOSITORY="nexus3.onap.org:10003" -IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" +IMAGE_NAME="${DOCKER_REPOSITORY:-"nexus3.onap.org:10003"}/${ORG:-"onap"}/${PROJECT:-"multicloud"}/${IMAGE:-"openstack-ocata"}" if [ $HTTP_PROXY ]; then BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" @@ -31,4 +27,4 @@ function push_image { } build_image -push_image
\ No newline at end of file +push_image |