changeset 119:5d2eb2f61dc8

docker (base): Twisted and Wokkel are now installed with pip instead of apt, as Jessie version is too old for SàT
author Goffi <goffi@goffi.org>
date Tue, 08 Mar 2016 18:36:14 +0100
parents 12cb931dbea0
children 37e100fd30ef
files docker/base/Dockerfile
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/docker/base/Dockerfile	Tue Mar 08 17:54:11 2016 +0100
+++ b/docker/base/Dockerfile	Tue Mar 08 18:36:14 2016 +0100
@@ -42,10 +42,17 @@
 chmod 2770 /usr/share/sat/certificates && \
 adduser sat tls-cert
 
-RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends locales dbus-x11 python python-gobject-2 python-dbus python-lxml python-mutagen python-pil python-crypto python-feed python-potr python-twisted-core python-twisted-mail python-twisted-web python-twisted-words python-wokkel python-xdg python-xe python-zope.interface python-gi python-urwid python-markdown python-html2text mercurial python-pip && apt-get clean && \
+RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends locales dbus-x11 python python-gobject-2 python-dbus python-lxml python-mutagen python-pil python-crypto python-feed python-potr python-xdg python-xe python-zope.interface python-gi python-urwid python-markdown python-html2text mercurial python-pip python-openssl python-service-identity gcc python-dev && \
+
+# we install Twisted from pip as Jessie version is too old
+pip install twisted wokkel pyOpenSSL && \
+
+# we remove stuff only needed to build Twisted
+# and clean what we can
+apt-get purge -y gcc python-dev && \
+apt-get autoremove -y && apt-get clean && \
 
 # dokuwiki module is needed for the blog importer
-
 pip install dokuwiki && \
 
 # we need a TCP socket for D-Bus