fix docker file

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e3aae0b..d7d6085 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,9 +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/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index e116c33..8f25b29 100755 (executable)
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+sudo chown onap:onap -R /service
 find  /service -name '*.sh'|xargs chmod a+x
 
 if [ -z "$SERVICE_IP" ]; then

diff --git a/docker/docker-env-conf.sh b/docker/docker-env-conf.sh
index 8cb2000..2c355a7 100644 (file)
--- 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 && \