[extensions-web] openshift: update Dockerfile

[Yuri Konotopov <ykonotopov src gnome org>]

commit 81efcce633c478a9858cb701911dcc744e6eb43b
Author: Yuri Konotopov <ykonotopov gnome org>
Date:   Tue Apr 2 23:25:22 2019 +0400

    openshift: update Dockerfile
    
    1. Upgrade Xapia to 1.4.11
    2. Pin Sphinx to <2.0.0 because xapian-bindings failing with newer Sphinx
    3. Use pinned versions of e.g.o. production dependencies
    4. Cleanup docker image

 openshift/docker/Dockerfile | 10 ++++++----
 requirements.ego.txt        |  5 +++++
 requirements.txt            | 11 +++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/openshift/docker/Dockerfile b/openshift/docker/Dockerfile
index 1988068..8c9b34b 100644
--- a/openshift/docker/Dockerfile
+++ b/openshift/docker/Dockerfile
@@ -3,7 +3,7 @@ FROM python:3.6-stretch
 MAINTAINER Yuri Konotopov <ykonotopov gnome org>
 
 ENV PYTHONUNBUFFERED=1 \
-       XAPIAN_VERSION=1.4.9 \
+       XAPIAN_VERSION=1.4.11 \
        GPG_KEY=08E2400FF7FE8FEDE3ACB52818147B073BAD2B07
 
 RUN set -ex \
@@ -11,7 +11,6 @@ RUN set -ex \
        && apt-get install --no-install-recommends --no-install-suggests -y \
                gettext \
        && rm -r /var/lib/apt/lists/* \
-       && pip install Sphinx \
        && wget -O xapian-core.tar.xz 
"https://oligarchy.co.uk/xapian/$XAPIAN_VERSION/xapian-core-$XAPIAN_VERSION.tar.xz"; \
        && wget -O xapian-core.tar.xz.asc 
"https://oligarchy.co.uk/xapian/$XAPIAN_VERSION/xapian-core-$XAPIAN_VERSION.tar.xz.asc"; \
        && wget -O xapian-bindings.tar.xz 
"https://oligarchy.co.uk/xapian/$XAPIAN_VERSION/xapian-bindings-$XAPIAN_VERSION.tar.xz"; \
@@ -46,10 +45,14 @@ RUN set -ex \
        && ldconfig \
        && rm -r /usr/src/xapian-core \
        && cd /usr/src/xapian-bindings \
+       && pip install Sphinx\<2.0.0 \
        && ./configure \
                --with-python3 \
        && make -j "$(nproc)" \
        && make install \
+       && pip freeze > /tmp/pip.txt \
+       && pip uninstall -y -r /tmp/pip.txt \
+       && rm /tmp/pip.txt \
        && find /usr/local -depth \
                \( \
                        \( -type d -a \( -name test -o -name tests \) \) \
@@ -71,6 +74,5 @@ RUN set -ex \
        && chown www-data:root -R /extensions-web/app \
        && chown www-data:root /extensions-web/wsgi.ini \
        && pip install -r requirements.txt \
-       && pip install mysqlclient\<1.4 \
-       && pip install uWSGI \
+       && pip install -r requirements.ego.txt \
        && EGO_SECRET_KEY=- python manage.py compilemessages
diff --git a/requirements.ego.txt b/requirements.ego.txt
new file mode 100644
index 0000000..5409bc2
--- /dev/null
+++ b/requirements.ego.txt
@@ -0,0 +1,5 @@
+mysqlclient==1.4.2.post1 \
+    --hash=sha256:425e733b05e359a714d6007c0fc44582be66b63e5a3df0a50949274ae16f4bc6 \
+    --hash=sha256:f257d250f2675d0ef99bd318906f3cfc05cef4a2f385ea695ff32a3f04b9f9a7
+uWSGI==2.0.18 \
+    --hash=sha256:4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583
diff --git a/requirements.txt b/requirements.txt
index fc073bd..8877ad8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -36,3 +36,14 @@ dj-database-url==0.5.0 \
 dj-email-url==0.1.0 \
     --hash=sha256:84f32673156f58d740a14cab09f04ca92a65b2c8881b60e31e09e67d7853e544 \
     --hash=sha256:de8e062c1483d1bfc7a9a185c6601f9c822087bd529756989f81f1dc82855cee
+# Django dependencies
+pytz==2018.9 \
+    --hash=sha256:32b0891edff07e28efe91284ed9c31e123d84bea3fd98e1f72be2508f43ef8d9 \
+    --hash=sha256:d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c
+sqlparse==0.3.0 \
+    --hash=sha256:40afe6b8d4b1117e7dff5504d7a8ce07d9a1b15aeeade8a2d10f130a834f8177 \
+    --hash=sha256:7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873
+# django-registration dependepcy
+confusable_homoglyphs==3.2.0 \
+    --hash=sha256:3b4a0d9fa510669498820c91a0bfc0c327568cecec90648cf3819d4a6fc6a751 \
+    --hash=sha256:e3ce611028d882b74a5faa69e3cbb5bd4dcd9f69936da6e73d33eda42c917944