summaryrefslogtreecommitdiffstats
path: root/fcaps/docker/Dockerfile
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2019-08-27 03:52:08 +0000
committerBin Yang <bin.yang@windriver.com>2019-08-27 04:50:43 +0000
commit7a31c2e438da2d165f473f7428cee7d2164312df (patch)
treeace10c3428b58f2d8d2066978964ed80478279d6 /fcaps/docker/Dockerfile
parent4a42f215d7009fc825bbff5b120913f21660ee59 (diff)
Fix py3 related issue
Change-Id: I2b21aaab2cbf0df11b9940bf62585294dd1ce576 Issue-ID: MULTICLOUD-774 Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'fcaps/docker/Dockerfile')
-rw-r--r--fcaps/docker/Dockerfile11
1 files changed, 6 insertions, 5 deletions
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