Fix docker build script 33/9633/1
authorfujinhua <fu.jinhua@zte.com.cn>
Thu, 31 Aug 2017 09:11:38 +0000 (17:11 +0800)
committerfujinhua <fu.jinhua@zte.com.cn>
Thu, 31 Aug 2017 09:11:38 +0000 (17:11 +0800)
Add ORG and VERSION parameter

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

index bbe2f84..13bfd19 100755 (executable)
@@ -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