From 7a31c2e438da2d165f473f7428cee7d2164312df Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Tue, 27 Aug 2019 03:52:08 +0000 Subject: Fix py3 related issue Change-Id: I2b21aaab2cbf0df11b9940bf62585294dd1ce576 Issue-ID: MULTICLOUD-774 Signed-off-by: Bin Yang --- fcaps/docker/Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'fcaps/docker') diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile index 93ad6f1f..021e40eb 100644 --- a/fcaps/docker/Dockerfile +++ b/fcaps/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2-alpine +FROM python:3-alpine ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} @@ -18,16 +18,17 @@ EXPOSE 9011 RUN addgroup -S onap && adduser -S -G onap onap # COPY ./ /opt/fcaps/ +COPY ./multicloud-openstack-fcaps-*.zip /opt/multicloud-openstack-fcaps.zip RUN apk update && \ - apk add uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \ + apk add pcre pcre-dev uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \ cd /opt/ && \ - wget -O multicloud-openstack-fcaps.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.multicloud.openstack&a=multicloud-openstack-fcaps&e=zip&v=1.4.0" && \ unzip -q -o -B multicloud-openstack-fcaps.zip && \ chmod +x /opt/fcaps/*.sh && \ rm -f multicloud-openstack-fcaps.zip && \ - pip install -r /opt/fcaps/requirements.txt && \ - apk del wget unzip gcc make libc-dev libffi-dev openssl-dev && \ + pip3 install -r /opt/fcaps/requirements.txt && \ + pip3 install -r /opt/fcaps/uwsgi-requirements.txt && \ + apk del wget unzip gcc make libc-dev libffi-dev openssl-dev pcre-dev && \ mkdir -p /var/log/onap/multicloud/fcaps && \ chown onap:onap /var/log/onap -R && \ chown onap:onap /opt/fcaps -R -- cgit 1.2.3-korg