summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2019-05-14 09:52:44 +0800
committeryangyan <yangyanyj@chinamobile.com>2019-05-14 09:52:51 +0800
commit4f5a82c284d107ce368abb8d1574cab1f07e2160 (patch)
tree24e389c6f4445adcb72467cd4c6cda4d73c148c6
parentc966a96efb7f305b75edfecfb3218d0c835abc1a (diff)
fix bug of docker file
Change-Id: I064f6bb2c754b0bb8b9552f794c4a2a1c844f734 Issue-ID: VFC-1386 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
-rw-r--r--res/docker/Dockerfile2
-rwxr-xr-xres/docker/docker-env-conf.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/docker/Dockerfile b/res/docker/Dockerfile
index b9f995e..ca5d244 100644
--- a/res/docker/Dockerfile
+++ b/res/docker/Dockerfile
@@ -5,7 +5,7 @@ ARG HTTPS_PROXY=${HTTPS_PROXY}
ARG PKG_VERSION
ENV http_proxy $HTTP_PROXY
ENV https_proxy $HTTPS_PROXY
-ENV pkg_verison=${PKG_VERSION}
+ENV pkg_version=${PKG_VERSION}
ADD . /service
WORKDIR /service
diff --git a/res/docker/docker-env-conf.sh b/res/docker/docker-env-conf.sh
index 5848339..58cf517 100755
--- a/res/docker/docker-env-conf.sh
+++ b/res/docker/docker-env-conf.sh
@@ -7,7 +7,7 @@ install_sf(){
apk --no-cache add python-dev libffi-dev musl-dev py2-virtualenv
# get binary zip from nexus
- wget -q -O vfc-gvnfm-vnfres.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnfres.res&a=vfc-gvnfm-vnfres-res&v=${pkg_verison}-SNAPSHOT&e=zip' && \
+ wget -q -O vfc-gvnfm-vnfres.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnfres.res&a=vfc-gvnfm-vnfres-res&v=${pkg_version}-SNAPSHOT&e=zip" && \
unzip vfc-gvnfm-vnfres.zip && \
rm -rf vfc-gvnfm-vnfres.zip
wait