Mercurial > sat_docs
diff docker/prosody/scripts/prosody @ 116:d0a5db5b9bdf
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 |
line wrap: on
line diff
--- a/docker/prosody/scripts/prosody Fri Mar 04 23:25:42 2016 +0100 +++ b/docker/prosody/scripts/prosody Fri Mar 04 23:31:26 2016 +0100 @@ -16,4 +16,4 @@ openssl req -new -x509 -days 1825 -nodes -out "/usr/share/sat/certificates/libervia.crt"\ -newkey rsa:4096 -keyout "/usr/share/sat/certificates/libervia.key" -subj "/C=AU/CN=$DOMAIN" fi -/usr/bin/prosody "$@" +exec /usr/bin/prosody "$@"