Add ARG PKG_VERSION to Dockerfile

Change-Id: I6dee3200b93292113d22984b10e94b384480681f
Issue-ID: VFC-1163
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/zte/vmanager/docker/Dockerfile b/zte/vmanager/docker/Dockerfile
index 4b1d4b4..b04e25d 100644 (file)
--- a/zte/vmanager/docker/Dockerfile
+++ b/zte/vmanager/docker/Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:14.04
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
+ARG PKG_VERSION
 
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY
@@ -26,7 +27,7 @@ ADD . /service
 WORKDIR /service
 
 # get binary zip from nexus - vfc-nfvo-driver-vnfm-svnfm-zte-vmanager
-RUN wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=LATEST&e=zip' && \
+RUN wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=${PKG_VERSION}-SNAPSHOT&e=zip' && \
     unzip vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip && \
     rm -rf vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip
 

diff --git a/zte/vmanager/docker/build_image.sh b/zte/vmanager/docker/build_image.sh
index 4f1c99c..2e60ca1 100755 (executable)
--- a/zte/vmanager/docker/build_image.sh
+++ b/zte/vmanager/docker/build_image.sh
@@ -13,6 +13,8 @@ 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}"
 fi