From: yangyan <yangyanyj@chinamobile.com>
Date: Fri, 10 May 2019 10:16:21 +0000 (+0800)
Subject: Add ARG and PKG_VERSION to Dockerfile
X-Git-Tag: 1.3.1~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3fe1223629b7d58f825b7c5366ebb929eb962f30;p=vfc%2Fnfvo%2Fcatalog.git

Add ARG and PKG_VERSION to Dockerfile

Change-Id: I99747948a8e1b1f8d6912976bd9c491a92b72714
Issue-ID: VFC-1383
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 68570116..90bcceef 100755
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,8 +2,11 @@ FROM python:2-alpine
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
+ARG PKG_VERSION
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY
+ENV pkg_verison=${PKG_VERSION}
+
 ADD . /service
 WORKDIR /service
 
diff --git a/docker/build_image.sh b/docker/build_image.sh
index 7891b16b..1cb06833 100755
--- a/docker/build_image.sh
+++ b/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
diff --git a/docker/docker-env-conf.sh b/docker/docker-env-conf.sh
index b523562c..96754def 100755
--- a/docker/docker-env-conf.sh
+++ b/docker/docker-env-conf.sh
@@ -8,7 +8,7 @@ install_sf(){
 
     # get binary zip from nexus - vfc-nfvo-catalog
 
-    wget -q -O vfc-nfvo-catalog.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.catalog&a=vfc-nfvo-catalog&v=LATEST&e=zip' && \
+    wget -q -O vfc-nfvo-catalog.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.catalog&a=vfc-nfvo-catalog&v=${pkg_verison}-SNAPSHOT&e=zip' && \
     unzip vfc-nfvo-catalog.zip && \
     rm -rf vfc-nfvo-catalog.zip && \
     pip install --upgrade setuptools pip && \