X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=doctor.git;a=blobdiff_plain;f=doctor_tests%2Fadmin_tool%2Ffenix%2FDockerfile;fp=doctor_tests%2Fadmin_tool%2Ffenix%2FDockerfile;h=5804b20782f3e024e95068ba511340c66f46f85a;hp=90039b0d7a2832a0b4b689c784941ae3101490e0;hb=a0528f67abe01f0bb4be3565cfef4fd049afa1fa;hpb=e961ab783887a9c44d2a321df646f1c49f83b299

diff --git a/doctor_tests/admin_tool/fenix/Dockerfile b/doctor_tests/admin_tool/fenix/Dockerfile
index 90039b0d..5804b207 100644
--- a/doctor_tests/admin_tool/fenix/Dockerfile
+++ b/doctor_tests/admin_tool/fenix/Dockerfile
@@ -1,4 +1,4 @@
-FROM gliderlabs/alpine:3.5
+FROM gliderlabs/alpine:3.6
 
 ARG BRANCH=master
 ARG OPENSTACK=master
@@ -11,23 +11,24 @@ RUN echo "Building Fenix container against OpenStack $OPENSTACK" && \
     mkdir -p /var/tmp/fenix
 WORKDIR /var/tmp/fenix
 COPY fenix*.conf /etc/fenix/
+
 RUN apk --no-cache add ca-certificates && \
     apk --no-cache add --update python3 sshpass py-pip git curl  && \
     apk --no-cache add --virtual .build-deps --update \
-        python-dev python3-dev build-base linux-headers libffi-dev \
+        python3-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev && \
-    curl https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK > upper-constraints.txt && \
-    pip install --upgrade pip  && \
-    pip install alembic aodhclient ast decorator \
-        eventlet flask Flask-RESTful importlib \
-        keystoneauth1 logging python-novaclient oslo.config oslo.db \
-        oslo.log oslo.messaging oslo.serialization oslo.service \
-        oslotest oslo.utils pbr pymysql setuptools six sqlalchemy \
-        wsgiref -cupper-constraints.txt && \
-    git clone https://git.openstack.org/openstack/fenix -b $BRANCH /fenix && \
+    curl https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK/upper-constraints.txt > upper-constraints.txt && \
+    if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi && \
+    if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi && \
+    pip3 install --upgrade pip && \
+    pip3 install alembic aodhclient decorator flask Flask-RESTful eventlet \
+        keystoneauth1 keystonemiddleware python-novaclient oslo.config pecan \
+        oslo.db oslo.log oslo.messaging oslo.serialization oslo.service oslo_policy \
+        oslotest oslo.utils pbr pymysql six sqlalchemy -cupper-constraints.txt && \
+    git clone https://opendev.org/x/fenix -b $BRANCH /fenix && \
     rm -fr /var/tmp/fenix
 COPY run /fenix
-COPY overcloudrc /fenix
+COPY keystonercv3 /fenix
 WORKDIR /fenix
-RUN python setup.py install
+RUN python3 setup.py install
 CMD ./run