aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile4
-rw-r--r--docker/build_image.sh1
-rw-r--r--docker/docker-env-conf.sh2
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 && \