diff options
| author |   hongyuzhao <zhao.hongyu@zte.com.cn> | 2019-07-05 17:09:23 +0800 |
|---|---|---|
| committer | hongyuzhao <zhao.hongyu@zte.com.cn> | 2019-07-05 17:22:14 +0800 |
| commit | 70b7b98e61ced0d54dbfe4fd028a060366ed92e6 (patch) | |
| tree | 90b64ea7491af0d54cf4511cbba04367d33b1be5 /res/docker | |
| parent | c2036d99659bc9310eee9f275a92aedbdb326bca (diff) | |
vnfres upgrade from python2 to python3
Change-Id: Ide7c76f81f59a1ccd22c6550ee6c7f68e29cb021
Issue-ID: VFC-1429
Signed-off-by: hongyuzhao <zhao.hongyu@zte.com.cn>
Diffstat (limited to 'res/docker')
| -rw-r--r-- | res/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | res/docker/docker-env-conf.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/docker/Dockerfile b/res/docker/Dockerfile index ca5d244..01dd1b2 100644 --- a/res/docker/Dockerfile +++ b/res/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/res/docker/docker-env-conf.sh b/res/docker/docker-env-conf.sh index 58cf517..5b5d961 100755 --- a/res/docker/docker-env-conf.sh +++ b/res/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 python3-dev libffi-dev musl-dev py3-virtualenv # get binary zip from nexus wget -q -O vfc-gvnfm-vnfres.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnfres.res&a=vfc-gvnfm-vnfres-res&v=${pkg_version}-SNAPSHOT&e=zip" && \ |