summaryrefslogtreecommitdiffstats
path: root/zte/vmanager/docker
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2018-11-09 09:15:02 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2018-11-09 09:17:12 +0800
commit6f0bedcfe5e5f88def07bcd0d30346a8185fa686 (patch)
treeaa74939070aa8d327b96a3d2cb4dacc77cc17959 /zte/vmanager/docker
parentf53e9a2b563bcd16296e2f1cfaace305e0f48150 (diff)
Add ARG PKG_VERSION to Dockerfile
Change-Id: I6dee3200b93292113d22984b10e94b384480681f Issue-ID: VFC-1163 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
Diffstat (limited to 'zte/vmanager/docker')
-rw-r--r--zte/vmanager/docker/Dockerfile3
-rwxr-xr-xzte/vmanager/docker/build_image.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/zte/vmanager/docker/Dockerfile b/zte/vmanager/docker/Dockerfile
index 4b1d4b41..b04e25d0 100644
--- a/zte/vmanager/docker/Dockerfile
+++ b/zte/vmanager/docker/Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:14.04
ARG HTTP_PROXY=${HTTP_PROXY}
ARG HTTPS_PROXY=${HTTPS_PROXY}
+ARG PKG_VERSION
ENV http_proxy $HTTP_PROXY
ENV https_proxy $HTTPS_PROXY
@@ -26,7 +27,7 @@ ADD . /service
WORKDIR /service
# get binary zip from nexus - vfc-nfvo-driver-vnfm-svnfm-zte-vmanager
-RUN wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=LATEST&e=zip' && \
+RUN wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=${PKG_VERSION}-SNAPSHOT&e=zip' && \
unzip vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip && \
rm -rf vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip
diff --git a/zte/vmanager/docker/build_image.sh b/zte/vmanager/docker/build_image.sh
index 4f1c99c4..2e60ca17 100755
--- a/zte/vmanager/docker/build_image.sh
+++ b/zte/vmanager/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