comparison docker/sat_pubsub/Dockerfile @ 80:686a8c982c3f

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
comparison
equal deleted inserted replaced
79:694fd34ff0b3 80:686a8c982c3f
25 os.chdir("/usr/share/sat_pubsub")\n\ 25 os.chdir("/usr/share/sat_pubsub")\n\
26 proxy = xmlrpclib.ServerProxy("http://prosody:9999/")\n\ 26 proxy = xmlrpclib.ServerProxy("http://prosody:9999/")\n\
27 domain = proxy.getenv("DOMAIN")\n\ 27 domain = proxy.getenv("DOMAIN")\n\
28 secret = proxy.getenv("SAT_PUBSUB_SECRET")\n\ 28 secret = proxy.getenv("SAT_PUBSUB_SECRET")\n\
29 os.execlp("twistd", "twistd", "-n", "sat_pubsub", "--rhost", "prosody",\ 29 os.execlp("twistd", "twistd", "-n", "sat_pubsub", "--rhost", "prosody",\
30 "--jid", "sat-pubsub.%s" % domain, "--secret", secret)\n\ 30 "--jid", "pubsub.%s" % domain, "--secret", secret)\n\
31 ' > /usr/local/bin/sat_pubsub && chmod 0555 /usr/local/bin/sat_pubsub 31 ' > /usr/local/bin/sat_pubsub && chmod 0555 /usr/local/bin/sat_pubsub
32 32
33 WORKDIR /usr/share 33 WORKDIR /usr/share
34 34
35 RUN hg clone http://repos.goffi.org/sat_pubsub && chown -R sat:sat sat_pubsub 35 RUN hg clone https://repos.goffi.org/sat_pubsub && chown -R sat:sat sat_pubsub
36 36
37 ############ 37 ############
38 # DATABASE # 38 # DATABASE #
39 ############ 39 ############
40 40