From: tianxing <15210838572@139.com>
Date: Tue, 14 May 2019 03:31:13 +0000 (+0800)
Subject: modify docker file
X-Git-Tag: 1.3.1~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F87618%2F1;p=vfc%2Fnfvo%2Fcatalog.git

modify docker file

Change-Id: I15837953569f35747dabaec3e1202059af5ed398
Issue-ID: VFC-1386
Signed-off-by: tianxing <15210838572@139.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 90bcceef..78fad8d4 100755
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,10 +2,10 @@ FROM python:2-alpine
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
-ARG PKG_VERSION
+# ARG PKG_VERSION
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY
-ENV pkg_verison=${PKG_VERSION}
+# ENV pkg_verison=${PKG_VERSION}
 
 ADD . /service
 WORKDIR /service
diff --git a/docker/build_image.sh b/docker/build_image.sh
index 1cb06833..a0769acb 100755
--- a/docker/build_image.sh
+++ b/docker/build_image.sh
@@ -13,7 +13,7 @@ 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}"
+# BUILD_ARGS+=" --build-arg PKG_VERSION=${VERSION}"
 
 if [ $HTTP_PROXY ]; then
     BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
diff --git a/docker/docker-env-conf.sh b/docker/docker-env-conf.sh
index 3f34822d..b523562c 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=${pkg_verison}-SNAPSHOT&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=LATEST&e=zip' && \
     unzip vfc-nfvo-catalog.zip && \
     rm -rf vfc-nfvo-catalog.zip && \
     pip install --upgrade setuptools pip && \