prosody: migrate to prosody 0.11
This commit is contained in:
parent
8c48dce458
commit
0f0f32e07c
3 changed files with 16 additions and 18 deletions
|
@ -1,4 +1,4 @@
|
|||
FROM alpine:3.6
|
||||
FROM alpine:3.8
|
||||
|
||||
LABEL maintainer "J. Elfring <devops@elfrinjo.de>"
|
||||
|
||||
|
@ -7,11 +7,11 @@ RUN apk add --no-cache \
|
|||
--update \
|
||||
libcrypto1.0 \
|
||||
libidn \
|
||||
lua \
|
||||
lua-expat \
|
||||
lua-filesystem \
|
||||
lua-sec \
|
||||
lua-socket
|
||||
lua5.2 \
|
||||
lua5.2-expat \
|
||||
lua5.2-filesystem \
|
||||
lua5.2-sec \
|
||||
lua5.2-socket
|
||||
|
||||
## Install build envirnoment, build and remove unneeded things
|
||||
## This is done in one step to reduce image size
|
||||
|
@ -19,17 +19,15 @@ RUN apk add --update \
|
|||
--no-cache \
|
||||
--virtual .build-deps \
|
||||
alpine-sdk \
|
||||
git \
|
||||
mercurial \
|
||||
luarocks \
|
||||
libidn-dev \
|
||||
linux-headers \
|
||||
lua-busted \
|
||||
lua-dev \
|
||||
libidn-dev \
|
||||
lua5.2-busted \
|
||||
lua5.2-dev \
|
||||
openssl-dev \
|
||||
&& set -x \
|
||||
&& luarocks-5.1 install luabitop \
|
||||
&& hg clone https://hg.prosody.im/0.10 /prosody-src \
|
||||
&& ln -s /usr/bin/busted-5.2 /usr/local/bin/busted \
|
||||
&& hg clone https://hg.prosody.im/0.11 /prosody-src \
|
||||
&& cd /prosody-src \
|
||||
&& ./configure --no-example-certs \
|
||||
--cflags='-fPIC -Wall -std=c99 -pedantic -DWITHOUT_MALLINFO' \
|
||||
|
@ -41,12 +39,13 @@ RUN apk add --update \
|
|||
&& hg clone https://hg.prosody.im/prosody-modules/ /usr/local/lib/prosody-community-modules \
|
||||
&& rm -rf /usr/local/lib/prosody-community-modules/.hg \
|
||||
&& rm -rf /usr/local/lib/prosody-community-modules/.hgtags \
|
||||
&& rm -f /usr/local/bin/busted \
|
||||
&& apk del .build-deps
|
||||
|
||||
COPY ./assets/prosody.cfg.lua /usr/local/etc/prosody/prosody.cfg.lua
|
||||
RUN chown daemon:daemon /usr/local/var/lib/prosody
|
||||
|
||||
EXPOSE 5222 5269 5347 5280 5281
|
||||
EXPOSE 5000 5222 5269 5347 5280 5281
|
||||
VOLUME ["/usr/local/etc/prosody", "/usr/local/var/lib/prosody"]
|
||||
|
||||
USER daemon
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Prosody Docker image
|
||||
|
||||
Create an image for running prosody XMPP server version 0.10
|
||||
Create an image for running prosody XMPP server version 0.11
|
||||
http://prosody.im/ on Alpine Linux.
|
||||
|
||||
HINT: This is not an official image. Builds might not happen regularly.
|
||||
|
@ -22,6 +22,7 @@ certificates.
|
|||
Do not forget to customize your configuration!
|
||||
```console
|
||||
$ docker run -d \
|
||||
-p 5000:5000 \
|
||||
-p 5222:5222 \
|
||||
-p 5269:5269 \
|
||||
-p 5280:5280 \
|
||||
|
|
|
@ -88,11 +88,9 @@ modules_enabled = {
|
|||
"csi";
|
||||
"mam";
|
||||
"privacy_lists";
|
||||
"pep_vcard_avatar";
|
||||
"smacks";
|
||||
"smacks_offline";
|
||||
"http_upload";
|
||||
"omemo_all_access";
|
||||
};
|
||||
|
||||
-- These modules are auto-loaded, but should you want
|
||||
|
@ -200,7 +198,7 @@ VirtualHost "example.com"
|
|||
---Set up a MUC (multi-user chat) room server on conference.example.com:
|
||||
Component "conference.example.com" "muc"
|
||||
modules_enabled = {
|
||||
"mam_muc";
|
||||
"muc_mam";
|
||||
"remote_roster";
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue