Mercurial > sat_docs
comparison docker/media/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 | b69056368901 |
comparison
equal
deleted
inserted
replaced
79:694fd34ff0b3 | 80:686a8c982c3f |
---|---|
8 | 8 |
9 FROM salutatoi/base:latest | 9 FROM salutatoi/base:latest |
10 | 10 |
11 MAINTAINER Goffi <goffi@goffi.org> | 11 MAINTAINER Goffi <goffi@goffi.org> |
12 | 12 |
13 WORKDIR /usr/share/sat/media_tmp | 13 WORKDIR /usr/share/sat |
14 | 14 |
15 # wget and tar are not installed, so we use python | 15 RUN hg clone https://repos.goffi.org/sat_media media |
16 RUN python -c 'import urllib2,tarfile,cStringIO;tar=tarfile.open(fileobj=cStringIO.StringIO(urllib2.urlopen("ftp://ftp.goffi.org/sat_media/sat_media.tar.bz2").read()));tar.extractall()' | |
17 | 16 |
18 # The media_tmp complication is due to an AUFS bug, see https://github.com/docker/docker/issues/4570 | 17 # ftp workflow is kept below on purpose, but we use currently hg for media |
19 WORKDIR /usr/share/sat/ | 18 # WORKDIR /usr/share/sat/media_tmp |
20 RUN mv media_tmp/sat_media* media && rmdir media_tmp | 19 # |
20 # # wget and tar are not installed, so we use python | |
21 # RUN python -c 'import urllib2,tarfile,cStringIO;tar=tarfile.open(fileobj=cStringIO.StringIO(urllib2.urlopen("ftp://ftp.goffi.org/sat_media/sat_media.tar.bz2").read()));tar.extractall()' | |
22 # | |
23 # # The media_tmp complication is due to an AUFS bug, see https://github.com/docker/docker/issues/4570 | |
24 # WORKDIR /usr/share/sat/ | |
25 # RUN mv media_tmp/sat_media* media && rmdir media_tmp | |
21 | 26 |
22 WORKDIR /home/sat | 27 WORKDIR /home/sat |