Mercurial > sat_docs

diff docker/base/Dockerfile @ 80:686a8c982c3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docker: updated Dockerfiles: - use HTTPS URLs instead of HTTP - prosody image know use prosody Debian repository instead of Debian Jessie version, prosody 0.10 is used - prosody configuration is now in prosody directory next to Dockerfile, instead of using difficult to maintain sed calls - community modules are downloaded from mercurial, and only needed ones are kept - no more remote-roster hack \o/ - pubsub component is not at pubsub.[domain] (was sat-pubsub before) - SàT media are gotten from hg instead of ftp, so they are up-to-date with SàT version - libervia image now use pip for txJSON-RPC - fixed now needed jinja2 installation - fixed libervia/admin accounts auto-creation script - fixed uid/gid for prosody in data image - removed not needed anymore nox option in base image - added python-pip in base image - docker images now work with current dev version (0.6.0D)
author Goffi <goffi@goffi.org>
date Fri, 12 Feb 2016 20:24:24 +0100
parents 0e78c8a4626e
children 8dd32aa49614
line wrap: on
line diff
--- a/docker/base/Dockerfile	Wed Feb 10 18:22:56 2016 +0100
+++ b/docker/base/Dockerfile	Fri Feb 12 20:24:24 2016 +0100
@@ -18,7 +18,7 @@
 
 RUN apt-get update
 RUN apt-get upgrade -y
-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
+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
 RUN apt-get clean
 
 # we need UTF-8 locale
@@ -38,7 +38,7 @@
 
 WORKDIR /tmp
 
-RUN hg clone http://repos.goffi.org/urwid-satext
+RUN hg clone https://repos.goffi.org/urwid-satext
 
 WORKDIR urwid-satext
 
@@ -54,11 +54,11 @@
 
 WORKDIR /tmp
 
-RUN hg clone http://repos.goffi.org/sat
+RUN hg clone https://repos.goffi.org/sat
 
 WORKDIR sat
 
-RUN SAT_INSTALL=nox python setup.py install --prefix /usr --install-lib /usr/lib/python2.7/dist-packages
+RUN python setup.py install --prefix /usr --install-lib /usr/lib/python2.7/dist-packages
 
 WORKDIR /tmp
 
@@ -74,8 +74,8 @@
 # so we remove it from reserved_list in plugin account
 RUN echo '[plugin account]\nreserved_list=' >> /etc/sat.conf
 
-# This script set account domain in sat.conf is not already set
-# if not set, domain is gotted from prosody container or DOMAIN environment variable
+# This script set account domain in sat.conf if not already set
+# if not set, domain is got from prosody container or DOMAIN environment variable
 RUN echo '#!/usr/bin/env python2\n\
 import os, xmlrpclib, ConfigParser, socket, subprocess\n\
 from sat.core.constants import Const as C\n\
@@ -108,7 +108,7 @@
 subprocess.call(["add_host", domain, "prosody"])\n\
 ' > /usr/local/bin/set_account_domain && chmod 0555 /usr/local/bin/set_account_domain
 
-# account domain is set, then sat is launcher with D-Bus activated
+# account domain is set, then sat is launched with D-Bus activated
 RUN echo '#!/bin/sh\n\
 chmod a+w /etc/hosts\n\
 su -c "set_account_domain && dbus-launch /usr/bin/sat $@" sat\n\