From: fujinhua <fu.jinhua@zte.com.cn>
Date: Thu, 31 Aug 2017 09:11:38 +0000 (+0800)
Subject: Fix docker build script
X-Git-Tag: v1.0.0~45
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vfc%2Fgvnfm%2Fvnflcm.git;a=commitdiff_plain;h=f6cb853c7128df75168664821a2cbcf5cf2ac674

Fix docker build script

Add ORG and VERSION parameter

Change-Id: Idf52c41dedae299f308b269ccd78ad822ed54076
Issue-Id: VFC-198
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---

diff --git a/lcm/docker/build_image.sh b/lcm/docker/build_image.sh
index bbe2f84e..13bfd194 100755
--- a/lcm/docker/build_image.sh
+++ b/lcm/docker/build_image.sh
@@ -2,6 +2,9 @@
 
 MYSQL_ROOT_PASSWORD="root"
 PROXY_ARGS=""
+ORG="onap"
+VERSION="1.0.0-SNAPSHOT"
+IMAGE="vfc-gvnfm-vnflcm"
 
 if [ $HTTP_PROXY ]; then
     PROXY_ARGS+="--build-arg HTTP_PROXY=${HTTP_PROXY}"
@@ -11,8 +14,7 @@ if [ $HTTPS_PROXY ]; then
 fi
 
 function build_vnflcm {
-    cd ../
-    docker build ${PROXY_ARGS} --build-arg MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} -f docker/Dockerfile -t vfc-gvnfm-vnflcm .
+    docker build ${PROXY_ARGS} --build-arg MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} -t ${ORG}/${IMAGE}:${VERSION} -t ${ORG}/${IMAGE}:latest ${IMAGE}/target
 }
 
 build_vnflcm