diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2019-05-10 16:10:12 +0800 |
|---|---|---|
| committer | yangyan <yangyanyj@chinamobile.com> | 2019-05-10 16:30:57 +0800 |
| commit | f8ad221b968ac85391d79a11db6546c933947f9d (patch) | |
| tree | 09d61283a7a5ab915358e5a57d57b3731d204383 | |
| parent | c363c2c9e5fd2cad61d9f64bea3d1a911e13e987 (diff) | |
Add ARG PKG_VERSION to Dockerfile
Change-Id: I5b5aa75a3838a87c2f0aabcd4d721dc36d072be3
Issue-ID: VFC-1383
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
| -rw-r--r--[-rwxr-xr-x] | docker/Dockerfile | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/build_image.sh | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/docker-env-conf.sh | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index b0854803..51904207 100755..100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,8 +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 aec34555..9b050a71 100755..100644 --- a/docker/build_image.sh +++ b/docker/build_image.sh @@ -13,6 +13,8 @@ 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}" fi diff --git a/docker/docker-env-conf.sh b/docker/docker-env-conf.sh index 8cb20001..2c355a73 100755..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=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 && \ |