aboutsummaryrefslogtreecommitdiff
path: root/app/jitsi/build
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2021-01-28 19:28:15 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2021-01-28 19:28:15 +0100
commit0e848bb2d0e705e5e0858fe8f2c02a3c9c8f45e5 (patch)
tree8e90ed8e0ab6f79020e90fec9a24a90263a49f15 /app/jitsi/build
parent4809e27220d4805bce8f14585f902097f53607ee (diff)
downloadinfrastructure-0e848bb2d0e705e5e0858fe8f2c02a3c9c8f45e5.tar.gz
infrastructure-0e848bb2d0e705e5e0858fe8f2c02a3c9c8f45e5.zip
Polished prosody
Diffstat (limited to 'app/jitsi/build')
-rw-r--r--app/jitsi/build/jitsi-xmpp/Dockerfile15
-rwxr-xr-xapp/jitsi/build/jitsi-xmpp/xmpp_prosody2
-rwxr-xr-xapp/jitsi/build/jitsi-xmpp/xmpp_root4
3 files changed, 11 insertions, 10 deletions
diff --git a/app/jitsi/build/jitsi-xmpp/Dockerfile b/app/jitsi/build/jitsi-xmpp/Dockerfile
index b32953a..6357cc6 100644
--- a/app/jitsi/build/jitsi-xmpp/Dockerfile
+++ b/app/jitsi/build/jitsi-xmpp/Dockerfile
@@ -3,7 +3,13 @@ FROM debian:buster
ARG VERSION
RUN apt-get update && \
- apt-get install -y prosody=${VERSION}
+ apt-get install -y wget gnupg2 && \
+ echo deb http://packages.prosody.im/debian buster main \
+ | tee -a /etc/apt/sources.list && \
+ wget https://prosody.im/files/prosody-debian-packages.key -O - \
+ | apt-key add - && \
+ apt-get update && \
+ apt-get install -y prosody=${VERSION} lua-event
RUN mkdir -p /usr/local/share/ca-certificates/ && \
ln -sf \
@@ -11,10 +17,11 @@ RUN mkdir -p /usr/local/share/ca-certificates/ && \
/usr/local/share/ca-certificates/auth.jitsi.crt && \
mkdir /run/prosody && \
touch /run/prosody/prosody.pid && \
- mkdir -p /var/lib/prosody
+ mkdir -p /var/lib/prosody && \
+ chown -R prosody:prosody /var/lib/prosody /run/prosody
-COPY xmpp_root /usr/local/bin/xmpp_root
COPY xmpp_prosody /usr/local/bin/xmpp_prosody
WORKDIR /var/lib/prosody
-CMD ["/usr/local/bin/xmpp_root"]
+USER prosody
+CMD ["/usr/local/bin/xmpp_prosody"]
diff --git a/app/jitsi/build/jitsi-xmpp/xmpp_prosody b/app/jitsi/build/jitsi-xmpp/xmpp_prosody
index 1101302..4ae73f4 100755
--- a/app/jitsi/build/jitsi-xmpp/xmpp_prosody
+++ b/app/jitsi/build/jitsi-xmpp/xmpp_prosody
@@ -1,5 +1,3 @@
#!/bin/bash
-chown -R prosody:prosody /var/lib/prosody /etc/prosody /run/prosody
-
cat /etc/prosody/accounts.txt | xargs -n3 prosodyctl register
exec prosody
diff --git a/app/jitsi/build/jitsi-xmpp/xmpp_root b/app/jitsi/build/jitsi-xmpp/xmpp_root
deleted file mode 100755
index 293915f..0000000
--- a/app/jitsi/build/jitsi-xmpp/xmpp_root
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-chown -R prosody:prosody /var/lib/prosody /etc/prosody /run/prosody
-exec su -s /bin/bash -c /usr/local/bin/xmpp_prosody - prosody