From 0e848bb2d0e705e5e0858fe8f2c02a3c9c8f45e5 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Thu, 28 Jan 2021 19:28:15 +0100
Subject: Polished prosody

---
 app/jitsi/build/jitsi-xmpp/Dockerfile   | 15 +++++++++++----
 app/jitsi/build/jitsi-xmpp/xmpp_prosody |  2 --
 app/jitsi/build/jitsi-xmpp/xmpp_root    |  4 ----
 3 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100755 app/jitsi/build/jitsi-xmpp/xmpp_root

(limited to 'app/jitsi/build')

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
-- 
cgit v1.2.3