diff options
| author |   tianxing <15210838572@139.com> | 2019-05-14 14:53:45 +0800 |
|---|---|---|
| committer | tianxing <15210838572@139.com> | 2019-05-14 14:53:55 +0800 |
| commit | cf6efa83ad8c531ad5159ad024b4dcfbae53a2c3 (patch) | |
| tree | 02a254fe296fca730732abd9d6f3403d80ac5dad | |
| parent | 6a3be78fe83ccfc190802035c84c7983c4d59421 (diff) | |
fix bug of docker file
Change-Id: I3e573344a68c728870c91be2051bcb41a2910c85
Issue-ID: VFC-1386
Signed-off-by: tianxing <15210838572@139.com>
| -rwxr-xr-x | docker/Dockerfile | 4 | ||||
| -rwxr-xr-x | docker/build_image.sh | 2 | ||||
| -rwxr-xr-x | docker/docker-env-conf.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 78fad8d4..f75f9091 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,10 +2,10 @@ FROM python:2-alpine ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} -# ARG PKG_VERSION +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/docker/build_image.sh b/docker/build_image.sh index a0769acb..1cb06833 100755 --- a/docker/build_image.sh +++ b/docker/build_image.sh @@ -13,7 +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}" +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 b523562c..a77ba520 100755 --- a/docker/docker-env-conf.sh +++ b/docker/docker-env-conf.sh @@ -8,7 +8,7 @@ install_sf(){ # get binary zip from nexus - vfc-nfvo-catalog - wget -q -O vfc-nfvo-catalog.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.catalog&a=vfc-nfvo-catalog&v=LATEST&e=zip' && \ + wget -q -O vfc-nfvo-catalog.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.catalog&a=vfc-nfvo-catalog&v=${pkg_version}-SNAPSHOT&e=zip" && \ unzip vfc-nfvo-catalog.zip && \ rm -rf vfc-nfvo-catalog.zip && \ pip install --upgrade setuptools pip && \ |