diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2019-05-10 17:07:54 +0800 |
|---|---|---|
| committer | Yan Yang <yangyanyj@chinamobile.com> | 2019-05-10 09:18:53 +0000 |
| commit | 51a5b243a40535f2a8b7133deed8deae2a6f765f (patch) | |
| tree | 56823fb158b5cac7fcecc2d3afc5b14692d68847 | |
| parent | 8cb9e959229ce80ad9ec1ce127382570860c00d1 (diff) | |
Add ARG and PKG_VERSION to Dockerfile
Change-Id: I260ab6b5a2c9d7cb464649eda0ff96d1412e57af
Issue-ID: VFC-1383
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/build_image.sh | 2 | ||||
| -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 98bea25..6631641 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 17ef9a7..e4538d0 100755 --- 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 fe35ff9..51f98c5 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-genericparser - wget -q -O modeling-genericparser.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.modeling.genericparser&a=modeling-genericparser&e=zip&v=1.0.1-SNAPSHOT' && \ + wget -q -O modeling-genericparser.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.modeling.genericparser&a=modeling-genericparser&e=zip&v=${pkg_version}-SNAPSHOT&e=zip' && \ unzip modeling-genericparser.zip && \ rm -rf modeling-genericparser.zip && \ pip install --upgrade setuptools pip && \ |