From: yangyan Date: Tue, 14 May 2019 01:49:33 +0000 (+0800) Subject: fix bug of gvnfm DockerFile X-Git-Tag: 1.3.2~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=39801f1162e598ebdbf4f2c0cc87324b4fd364c3;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fgvnfm.git fix bug of gvnfm DockerFile Change-Id: I822e8d5ea3db104a1d93cd0972cec31d8444c50e Issue-ID: VFC-1386 Signed-off-by: yangyan --- diff --git a/gvnfmadapter/docker/Dockerfile b/gvnfmadapter/docker/Dockerfile index fe7cf43..2b99d44 100644 --- a/gvnfmadapter/docker/Dockerfile +++ b/gvnfmadapter/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/gvnfmadapter/docker/docker-env-conf.sh b/gvnfmadapter/docker/docker-env-conf.sh index f3fdb9d..2cf7956 100755 --- a/gvnfmadapter/docker/docker-env-conf.sh +++ b/gvnfmadapter/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 - vfc-nfvo-catalog - wget -q -O vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter&a=vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter&v=${pkg_verison}-SNAPSHOT&e=zip' && \ + wget -q -O vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter&a=vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter&v=${pkg_version}-SNAPSHOT&e=zip" && \ unzip vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter.zip && \ rm -rf vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter.zip wait