Merge "Fix bugs for nslcm"

diff --git a/docker/Dockerfile b/docker/Dockerfile
old mode 100755 (executable)
new mode 100644 (file)
index b085480..5190420
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,8 +2,10 @@ 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_version=${PKG_VERSION}
 ADD . /service
 WORKDIR /service
 

diff --git a/docker/build_image.sh b/docker/build_image.sh
old mode 100755 (executable)
new mode 100644 (file)
index aec3455..9b050a7
--- 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
old mode 100755 (executable)
new mode 100644 (file)
index 8cb2000..2c355a7
--- a/docker/docker-env-conf.sh
+++ b/docker/docker-env-conf.sh
@@ -5,7 +5,7 @@ install_sf(){
     apk --no-cache update
     apk --no-cache add bash curl gcc wget mysql-client openssl-dev
     apk --no-cache add python-dev libffi-dev musl-dev py2-virtualenv
-    wget -q -O vfc-nfvo-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.lcm&a=vfc-nfvo-lcm&v=LATEST&e=zip' && \
+    wget -q -O vfc-nfvo-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.lcm&a=vfc-nfvo-lcm&v=${pkg_version}-SNAPSHOT&e=zip' && \
     unzip vfc-nfvo-lcm.zip && \
     rm -rf vfc-nfvo-lcm.zip && \
     pip install --upgrade setuptools pip && \