Mercurial > sat_docs

annotate docker/media/Dockerfile @ 116:d0a5db5b9bdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docker: fixed bad stopping: - use exec when it was missing, so the TERM signal is properly catched, and containers can be stopped instead of being killed after 10s - for a unknown reason, exec and su don't handle correctly "$@" with Docker in base.scripts/sat. It's working as expected when launched from withing a running container, but not when launched with "docker run", so a workaround is used with trap and wait
author Goffi <goffi@goffi.org>
date Fri, 04 Mar 2016 23:31:26 +0100
parents b69056368901
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
21
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
1 #################################################################
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
2 # #
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
3 # Salut à Toi/media #
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
4 # This Dockerfile build a « Salut à Toi » base image with media #
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
5 # Salut à Toi is a multi-frontends multi-purposes XMPP client #
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
6 # #
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
7 #################################################################
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
8
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
9 FROM salutatoi/base:latest
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
10
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
11 MAINTAINER Goffi <goffi@goffi.org>
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
12
105
b69056368901 docker: images optimisation:
Goffi <goffi@goffi.org>
parents: 80
diff changeset
13 RUN cd /usr/share/sat && hg clone https://repos.goffi.org/sat_media media
21
0e78c8a4626e Added Dockerfiles to create Docker images for easy installation + scripts to manages them. see README for details.
Goffi <goffi@goffi.org>
parents:
diff changeset
14
80
686a8c982c3f docker: updated Dockerfiles:
Goffi <goffi@goffi.org>
parents: 21
diff changeset
15 # ftp workflow is kept below on purpose, but we use currently hg for media
686a8c982c3f docker: updated Dockerfiles:
Goffi <goffi@goffi.org>
parents: 21
diff changeset
16 # WORKDIR /usr/share/sat/media_tmp
686a8c982c3f docker: updated Dockerfiles:
Goffi <goffi@goffi.org>
parents: 21
diff changeset
17 #
686a8c982c3f docker: updated Dockerfiles:
Goffi <goffi@goffi.org>
parents: 21
diff changeset
18 # # wget and tar are not installed, so we use python
686a8c982c3f docker: updated Dockerfiles:
Goffi <goffi@goffi.org>
parents: 21
diff changeset
19 # 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()'
686a8c982c3f docker: updated Dockerfiles:
Goffi <goffi@goffi.org>
parents: 21
diff changeset
20 #
686a8c982c3f docker: updated Dockerfiles:
Goffi <goffi@goffi.org>
parents: 21
diff changeset
21 # # The media_tmp complication is due to an AUFS bug, see https://github.com/docker/docker/issues/4570
686a8c982c3f docker: updated Dockerfiles:
Goffi <goffi@goffi.org>
parents: 21
diff changeset
22 # WORKDIR /usr/share/sat/
686a8c982c3f docker: updated Dockerfiles:
Goffi <goffi@goffi.org>
parents: 21
diff changeset
23 # RUN mv media_tmp/sat_media* media && rmdir media_tmp