[extensions-web/deploy] openshift: update Dockerfile
- From: Yuri Konotopov <ykonotopov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [extensions-web/deploy] openshift: update Dockerfile
- Date: Tue, 2 Apr 2019 19:29:31 +0000 (UTC)
commit d8d9f5a53639a712eb1f04f9b05c3682686e4dc9
Author: Yuri Konotopov <ykonotopov gnome org>
Date: Tue Apr 2 23:25:22 2019 +0400
openshift: update Dockerfile
1. Pin Sphinx to <2.0.0 because xapian-bindings failing with newer Sphinx
2. Cleanup docker image
openshift/docker/Dockerfile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/openshift/docker/Dockerfile b/openshift/docker/Dockerfile
index 2494142..9de5802 100644
--- a/openshift/docker/Dockerfile
+++ b/openshift/docker/Dockerfile
@@ -7,7 +7,6 @@ ENV PYTHONUNBUFFERED=1 \
GPG_KEY=08E2400FF7FE8FEDE3ACB52818147B073BAD2B07
RUN set -ex \
- && 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" \
@@ -42,10 +41,14 @@ RUN set -ex \
&& ldconfig \
&& rm -r /usr/src/xapian-core \
&& cd /usr/src/xapian-bindings \
+ && pip install Sphinx\<2.0.0 \
&& ./configure \
--with-python \
&& 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 \) \) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]