summaryrefslogtreecommitdiffstats
path: root/mgr/docker
diff options
context:
space:
mode:
authorhongyuzhao <zhao.hongyu@zte.com.cn>2019-07-05 15:26:08 +0800
committerhongyuzhao <zhao.hongyu@zte.com.cn>2019-07-05 15:51:52 +0800
commitde9024b973f8ed49d7ec3d97c0031b120f114d5f (patch)
tree931f800836bdd2316f34d0b57cd4563e361f010e /mgr/docker
parenta46745056321f9e5076e0d790713e46c46f8f59f (diff)
vnfmgr upgrade from python2 to python3
Change-Id: I72921484cc647ade42e2d48ecbf618d7743e0d0e Issue-ID: VFC-1429 Signed-off-by: hongyuzhao <zhao.hongyu@zte.com.cn>
Diffstat (limited to 'mgr/docker')
-rw-r--r--mgr/docker/Dockerfile2
-rwxr-xr-xmgr/docker/docker-env-conf.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/mgr/docker/Dockerfile b/mgr/docker/Dockerfile
index 79c698d..73292a5 100644
--- a/mgr/docker/Dockerfile
+++ b/mgr/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2-alpine
+FROM python:3.6-alpine
ARG HTTP_PROXY=${HTTP_PROXY}
ARG HTTPS_PROXY=${HTTPS_PROXY}
diff --git a/mgr/docker/docker-env-conf.sh b/mgr/docker/docker-env-conf.sh
index 3bb7c5f..b7247f8 100755
--- a/mgr/docker/docker-env-conf.sh
+++ b/mgr/docker/docker-env-conf.sh
@@ -4,7 +4,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
+ apk --no-cache add python36-dev libffi-dev musl-dev py3-virtualenv
# get binary zip from nexus
wget -q -O vfc-gvnfm-vnfmgr.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnfmgr.mgr&a=vfc-gvnfm-vnfmgr-mgr&v=${pkg_version}-SNAPSHOT&e=zip" && \