diff options
| author |   tianxing <15210838572@139.com> | 2019-05-13 11:32:29 +0800 |
|---|---|---|
| committer | Tian Xing <15210838572@139.com> | 2019-05-13 03:44:58 +0000 |
| commit | 711f01b090a39e971b062fcafe6ce0096652dc2b (patch) | |
| tree | 96ced7ba065db05eb75e2674ebb506a78125fcb7 | |
| parent | 8a9940b47bb0dd1604a18758426d8a77686838a8 (diff) | |
fix docker file
Change-Id: Id5502075c3c6552832329977077cf9f708b25ec9
Issue-ID: VFC-1386
Signed-off-by: tianxing <15210838572@139.com>
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/build_image.sh | 1 | ||||
| -rw-r--r-- | docker/docker-env-conf.sh | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 51904207..e3aae0be 100644 --- 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 + ENV http_proxy $HTTP_PROXY ENV https_proxy $HTTPS_PROXY -ENV pkg_version=${PKG_VERSION} + ADD . /service WORKDIR /service diff --git a/docker/build_image.sh b/docker/build_image.sh index 9b050a71..64360b19 100644 --- a/docker/build_image.sh +++ b/docker/build_image.sh @@ -13,7 +13,6 @@ 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..8cb20001 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=LATEST&e=zip' && \ unzip vfc-nfvo-lcm.zip && \ rm -rf vfc-nfvo-lcm.zip && \ pip install --upgrade setuptools pip && \ |