Commit Graph

61 Commits

Author SHA1 Message Date
Matthew Wild 3a21cd2c21 Merge pull request #65 from goffi-contrib/signal_fix
Fix signal handling
2020-10-12 06:55:37 +01:00
Jérôme Poisson cc88073a79 Fix signal handling
This patch add `exec` to replace the shell running the `entrypoint.sh`
script by Prosody executable.

This allows Prosody to catch and handle correctly signals, notably
SIGTERM and SIGINT. Without it, Docker can't stop correctly the
container, resulting in a 10 s delay before it kills it.
2020-10-10 21:20:17 +02:00
Kim Alvefur 4878e32010 Remove our repo
Debian versions of dependencies should be fine now
2020-02-14 00:50:18 +01:00
Kim Alvefur 7a6b4df1a2 README: Update for base image update 2020-02-14 00:47:17 +01:00
Matthew Wild 90963038ee Merge pull request #62 from prosody/dynamic-uid
Run with same UID as datadir owner
1.6.0
2020-02-13 11:18:06 +00:00
Kim Alvefur 95a9d24b76 Run with same UID as datadir owner
This should fix problems with owner/uid mismatch when an existing
prosody data directory is mounted into the container

Closes #39
2020-02-13 01:10:36 +01:00
Kim Alvefur 47d22ada68 Start prosody with the new flag to force foreground operation 2020-02-13 01:08:16 +01:00
Kim Alvefur 80c6ffc362 Install procps, dependency of recent packages 2020-02-12 19:55:34 +01:00
Kim Alvefur f2c1afeabe Add libicu needed by trunk nightly builds (fixes #59) 2020-02-12 19:52:19 +01:00
Kim Alvefur 3a47a006bc Switch base image to Debian 10 (closes #61)
OpenSSL version with TLS 1.3 support
2020-02-12 19:32:28 +01:00
Kim Alvefur e0c2334d2a Merge pull request #56 from Zash/shellcheck
Quote variables in entrypoint.sh
2019-03-31 18:47:34 +02:00
Kim Alvefur 8c4170e7d9 entrypoint.sh: Quote variables [shellcheck] 2019-03-16 19:19:37 +01:00
Matthew Wild 1fa2fb60ce Ensure prosody package key is world-readable (so apt user can read it) 1.5.3 2019-01-14 12:19:03 +00:00
Matthew Wild 21b5e2d19b Create directory for pidfile (usually created by init script) 1.5.2 2019-01-14 11:43:13 +00:00
Matthew Wild 4de30316aa Add lua5.2 for compatibility with 0.11 packages 2019-01-14 11:42:51 +00:00
Matthew Wild a60be883e9 Fix README to state new distribution base 1.5.1 2019-01-14 11:31:41 +00:00
Matthew Wild 72bf20f29f Update Dockerfile to Debian stretch 1.5.0 2019-01-14 11:28:19 +00:00
Matthew Wild 933be62950 README: Update to clarify intended usage of this repository 2018-04-26 18:24:58 +01:00
Kim Alvefur b186acf8ff Remove redundant LuaExpat package 2017-10-20 03:40:34 +02:00
Kim Alvefur 01bbe56547 Explicitly install some base requirements
These are in the Prosody debian package dependencies.
2017-10-20 03:39:45 +02:00
Kim Alvefur 67de3d1ecc Merge pull request #30 from chrw/fix-ca-certificates
Install ca-certificates package to fix s2s SSL errors.
2017-01-23 14:08:34 +01:00
Christian Wolff df16f5af7e Install ca-certificates package to fix s2s SSL errors. 2016-08-08 12:58:44 +02:00
Matthew Wild b98fdd49f4 build-docker.sh: Some small improvements for parameter handling 1.4.2 2016-03-11 17:37:41 +00:00
Matthew Wild c095ddd323 Dockerfile: chmod 755 the entrypoint, so we don't depend on the permissions of the build system, fixes #27 2016-03-11 15:51:35 +00:00
Matthew Wild 6d139045cf Merge pull request #28 from prosody/27-entrypoint.sh
Make `entrypoint.sh` executable
1.4.1
2016-03-09 11:13:37 +00:00
Lloyd Watkin b31d7c913e Make entrypoint.sh executable
Fixes #27
cc @mwild1
2016-03-09 08:52:23 +00:00
Matthew Wild d346e0912e Install lua-bitop, fixes #24 1.4.0 2016-02-04 19:24:01 +00:00
Matthew Wild 8bbb02e228 entrypoint.sh: If a command is passed to the image, run prosodyctl instead 2016-02-04 19:19:17 +00:00
Matthew Wild bed0d8e598 Run as user 'prosody', and run prosody instead of prosodyctl. Also set __FLUSH_LOG environment variable to tell Prosody it needs to flush its logs after writing. Fixes #23 and fixes #25. 2016-02-04 19:17:11 +00:00
Lloyd Watkin 82e59c9091 Merge pull request #19 from SamWhited/patch-1
Remove duplicate lua-zlib install line.
1.3.0
2015-10-26 09:08:37 +00:00
Sam Whited 2b420fa628 Remove duplicate lua-zlib install line. 2015-10-23 13:50:25 -05:00
Lloyd Watkin 9cbebe220d Merge pull request #14 from hudon/patch-1
Update README.md
2015-03-31 09:07:48 +02:00
James Hudon ef57949ed1 Update README.md 2015-03-30 15:37:43 -07:00
Lloyd Watkin b0f191cbd3 Merge pull request #13 from dwilson6/log-volume-doc-update
Update log volume documentation with note about permissions
2015-03-23 08:33:06 +00:00
Devin Wilson f84c37d808 Update log volume documentation with note about permissions 2015-03-20 10:00:41 -06:00
Lloyd Watkin da004da054 Volume mounting documentation fixes 2015-03-16 14:57:01 +00:00
Lloyd Watkin 7f9f2ca6ab Fix documentation
See #11
2015-03-15 15:48:51 +00:00
Lloyd Watkin d429b2ca59 Merge pull request #2 from DexterTheDragon/improve_dockerfile
Cleanup the Dockerfile
2015-01-01 21:30:46 +00:00
Lloyd Watkin 8c69d7f200 Merge pull request #4 from lloydwatkin/readme-fix
Fix README.md for running Prosody image
2014-12-20 22:11:06 +00:00
Lloyd Watkin 6629d6cf75 Fix README.md for running Prosody image
See #3
2014-12-20 22:10:39 +00:00
Kevin Carter 1b1f0ed951 Cleanup the Dockerfile
- Reduce the build steps to reduce the number and size of intermediate images
- Set the logging to stdout by default
- Remove default user create, but still allow optional user creation
- Fix entrypoint command setup
2014-12-07 20:02:23 -07:00
Lloyd Watkin 12dcdb0c64 Document adding a default
Fixes #1
1.2.0
2014-11-25 15:10:21 +00:00
Lloyd Watkin 56160ac766 Ignore errors 2014-11-25 15:05:04 +00:00
Lloyd Watkin a99fbcc814 Add a start up script 2014-11-25 15:04:08 +00:00
Lloyd Watkin 712f293389 Use a bash script to start prosody 2014-11-25 14:54:40 +00:00
Lloyd Watkin eb205258f8 Add port 5281 2014-11-24 14:27:32 +00:00
Lloyd Watkin 6f17c6ed1e Add link to prosody in the registry 2014-11-17 09:34:26 +00:00
Lloyd Watkin 7ea4bfbdae Document creating multiple tags from a single run 1.1.0 2014-11-15 15:16:11 +00:00
Lloyd Watkin e4cf4e52de Allow building of multiple tags from a single run 2014-11-15 15:15:58 +00:00
Lloyd Watkin 1d8b665909 Add 5281 as exposed port 2014-11-14 14:26:12 +00:00