Mercurial > sat_docs
diff 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 |
line wrap: on
line diff
--- a/docker/media/Dockerfile Wed Feb 10 18:22:56 2016 +0100 +++ b/docker/media/Dockerfile Fri Feb 12 20:24:24 2016 +0100 @@ -10,13 +10,18 @@ MAINTAINER Goffi <goffi@goffi.org> -WORKDIR /usr/share/sat/media_tmp +WORKDIR /usr/share/sat + +RUN hg clone https://repos.goffi.org/sat_media media -# wget and tar are not installed, so we use python -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()' - -# The media_tmp complication is due to an AUFS bug, see https://github.com/docker/docker/issues/4570 -WORKDIR /usr/share/sat/ -RUN mv media_tmp/sat_media* media && rmdir media_tmp +# ftp workflow is kept below on purpose, but we use currently hg for media +# WORKDIR /usr/share/sat/media_tmp +# +# # wget and tar are not installed, so we use python +# 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()' +# +# # The media_tmp complication is due to an AUFS bug, see https://github.com/docker/docker/issues/4570 +# WORKDIR /usr/share/sat/ +# RUN mv media_tmp/sat_media* media && rmdir media_tmp WORKDIR /home/sat