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