Code Review
/
vfc
/
nfvo
/
driver
/
vnfm
/
svnfm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update svnfm release version to 1.3.7
[vfc/nfvo/driver/vnfm/svnfm.git]
/
zte
/
vmanager
/
docker
/
build_image.sh
diff --git
a/zte/vmanager/docker/build_image.sh
b/zte/vmanager/docker/build_image.sh
index
9bf3b60
..
4839d85
100755
(executable)
--- a/
zte/vmanager/docker/build_image.sh
+++ b/
zte/vmanager/docker/build_image.sh
@@
-6,11
+6,14
@@
cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.
0.0-SNAPSHOT
"
+VERSION="1.
3.7
"
PROJECT="vfc"
PROJECT="vfc"
-IMAGE="ztev
manager
driver"
+IMAGE="ztev
nfm
driver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
+
+BUILD_ARGS+=" --build-arg PKG_VERSION=${VERSION}"
if [ $HTTP_PROXY ]; then
BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
if [ $HTTP_PROXY ]; then
BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
@@
-21,13
+24,23
@@
fi
function build_image {
echo "Start build docker image: ${IMAGE_NAME}"
function build_image {
echo "Start build docker image: ${IMAGE_NAME}"
- docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+ docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest .
+}
+
+function push_image_tag {
+ TAG_NAME=$1
+ echo "Start push ${TAG_NAME}"
+ docker tag ${IMAGE_NAME}:latest ${TAG_NAME}
+ docker push ${TAG_NAME}
}
function push_image {
}
function push_image {
- echo "Start push docker image: ${IMAGE_NAME}"
- docker push ${IMAGE_NAME}:${VERSION}
+ echo "Start push ${IMAGE_NAME}:latest"
docker push ${IMAGE_NAME}:latest
docker push ${IMAGE_NAME}:latest
+
+ push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest
+ push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest
+ push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-${TIMESTAMP}
}
build_image
}
build_image