comparison docker/base/Dockerfile @ 94:eeff161a19e8

docker (base): add dokuwiki module for dokuwiki importer + fixed /etc/hosts for subdomains
author Goffi <goffi@goffi.org>
date Wed, 24 Feb 2016 20:21:34 +0100
parents 8dc445c967e2
children 6e6274aa3916
comparison
equal deleted inserted replaced
93:70f65a6b3392 94:eeff161a19e8
18 18
19 RUN apt-get update 19 RUN apt-get update
20 RUN apt-get upgrade -y 20 RUN apt-get upgrade -y
21 RUN 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 21 RUN 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
22 RUN apt-get clean 22 RUN apt-get clean
23
24 # dokuwiki module is needed for the blog importer
25 RUN pip install dokuwiki
23 26
24 # we need UTF-8 locale 27 # we need UTF-8 locale
25 RUN sed -i "s/# en_US.UTF-8/en_US.UTF-8/" /etc/locale.gen 28 RUN sed -i "s/# en_US.UTF-8/en_US.UTF-8/" /etc/locale.gen
26 RUN locale-gen 29 RUN locale-gen
27 ENV LC_ALL en_US.UTF-8 30 ENV LC_ALL en_US.UTF-8
114 except ConfigParser.DuplicateSectionError:\n\ 117 except ConfigParser.DuplicateSectionError:\n\
115 pass\n\ 118 pass\n\
116 config.set(SECTION, OPTION, domain)\n\ 119 config.set(SECTION, OPTION, domain)\n\
117 config.write(open(CONFIG_PATH, "w"))\n\ 120 config.write(open(CONFIG_PATH, "w"))\n\
118 subprocess.call(["add_host", domain, "prosody"])\n\ 121 subprocess.call(["add_host", domain, "prosody"])\n\
122 for subdomain in ("chat", "proxy", "upload", "pubsub", "salut"):\n\
123 subprocess.call(["add_host", "{}.{}".format(subdomain, domain), "prosody"])\n\
119 ' > /usr/local/bin/set_account_domain && chmod 0555 /usr/local/bin/set_account_domain 124 ' > /usr/local/bin/set_account_domain && chmod 0555 /usr/local/bin/set_account_domain
120 125
121 # account domain is set, then sat is launched with D-Bus activated 126 # account domain is set, then sat is launched with D-Bus activated
122 RUN echo '#!/bin/sh\n\ 127 RUN echo '#!/bin/sh\n\
123 chmod a+w /etc/hosts\n\ 128 chmod a+w /etc/hosts\n\