From: tianxing <15210838572@139.com>
Date: Mon, 13 May 2019 13:36:53 +0000 (+0800)
Subject: fix bug of docker file
X-Git-Tag: 1.3.1~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0d3c00cea893cff8d40ee740af3282f3077c8f37;p=vfc%2Fnfvo%2Flcm.git

fix bug of docker file

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

diff --git a/docker/build_image.sh b/docker/build_image.sh
index 64360b19..9b050a71 100644
--- a/docker/build_image.sh
+++ b/docker/build_image.sh
@@ -13,6 +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}"
 
 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 2c355a73..02551615 100644
--- 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=${pkg_version}-SNAPSHOT&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 && \
diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index fdf64736..ed286cf9 100755
--- a/docker/instance_init.sh
+++ b/docker/instance_init.sh
@@ -24,3 +24,4 @@ function migrate_database {
 
 create_database
 migrate_database
+