aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile3
-rwxr-xr-xdocker/docker-entrypoint.sh1
-rw-r--r--docker/docker-env-conf.sh2
3 files changed, 4 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e3aae0be..d7d6085e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,9 +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/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index e116c33b..8f25b29a 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,5 +1,6 @@
#!/bin/bash
+sudo chown onap:onap -R /service
find /service -name '*.sh'|xargs chmod a+x
if [ -z "$SERVICE_IP" ]; then
diff --git a/docker/docker-env-conf.sh b/docker/docker-env-conf.sh
index 8cb20001..2c355a73 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 && \