X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fdocker%2Fbuild_image.sh;h=8ec282f61af701de1c2022b5902676bc31720208;hb=fb8bb7eb386b2e2b41c06eb0e1b29c721fb8d9c4;hp=b40f1cf78a35e19e58b72fe8dbc4b545aa2d6769;hpb=b3c72963f79580bddef8d5b51866134ef1a5ebe7;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/docker/build_image.sh b/lcm/docker/build_image.sh
index b40f1cf7..8ec282f6 100755
--- a/lcm/docker/build_image.sh
+++ b/lcm/docker/build_image.sh
@@ -1,29 +1,47 @@
 #!/bin/bash
+DIRNAME=`dirname $0`
+DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
+echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
+cd ${DOCKER_BUILD_DIR}
 
-MYSQL_ROOT_PASSWORD="root"
-PROXY_ARGS=""
+BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.0.0-SNAPSHOT"
+VERSION="1.3.5"
 PROJECT="vfc"
 IMAGE="vnflcm"
 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
-    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
 
-function build_vnflcm {
-    docker build ${PROXY_ARGS} --build-arg MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} -t ${ORG}/${PROJECT}/${IMAGE}:${VERSION} -t ${ORG}/${PROJECT}/${IMAGE}:latest .
+function build_image {
+    echo "Start build docker image: ${IMAGE_NAME}"
+    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_vnflcm {
-    docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}:${VERSION}
-    docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}:latest
+function push_image {
+    echo "Start 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_vnflcm
-push_vnflcm
-docker image list
+build_image
+push_image