diff options
| author | Quentin Dufour <quentin@deuxfleurs.fr> | 2021-01-28 21:05:10 +0100 |
|---|---|---|
| committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2021-01-28 21:05:10 +0100 |
| commit | 47bcdaaf0dc6d8caaaa8bd30055420ae90cc73eb (patch) | |
| tree | fb4aef2d82b4a95c3f18b62765f7fa0c90f87ac7 /app/jitsi/build | |
| parent | 0e848bb2d0e705e5e0858fe8f2c02a3c9c8f45e5 (diff) | |
| download | infrastructure-47bcdaaf0dc6d8caaaa8bd30055420ae90cc73eb.tar.gz infrastructure-47bcdaaf0dc6d8caaaa8bd30055420ae90cc73eb.zip | |
Rework prosody's configuration
Diffstat (limited to 'app/jitsi/build')
| -rwxr-xr-x | app/jitsi/build/jitsi-conference-focus/jicofo | 6 | ||||
| -rw-r--r-- | app/jitsi/build/jitsi-xmpp/Dockerfile | 16 |
2 files changed, 13 insertions, 9 deletions
diff --git a/app/jitsi/build/jitsi-conference-focus/jicofo b/app/jitsi/build/jitsi-conference-focus/jicofo index 31cd9c4..2225e98 100755 --- a/app/jitsi/build/jitsi-conference-focus/jicofo +++ b/app/jitsi/build/jitsi-conference-focus/jicofo @@ -1,13 +1,7 @@ #!/bin/bash -cp ${JITSI_CERTS_FOLDER}/auth.jitsi.deuxfleurs.fr.crt /usr/local/share/ca-certificates/auth.jitsi.deuxfleurs.fr.crt update-ca-certificates -f -cat >> /etc/hosts <<EOF -${JITSI_PROSODY_HOST} jitsi.deuxfleurs.fr conference.jitsi.deuxfleurs.fr jitsi-videobridge.jitsi.deuxfleurs.fr focus.jitsi.deuxfleurs.fr auth.jitsi.deuxfleurs.fr -127.0.0.1 `hostname` -EOF - exec java \ -Xmx400m \ -XX:+HeapDumpOnOutOfMemoryError \ diff --git a/app/jitsi/build/jitsi-xmpp/Dockerfile b/app/jitsi/build/jitsi-xmpp/Dockerfile index 6357cc6..e3a8f8f 100644 --- a/app/jitsi/build/jitsi-xmpp/Dockerfile +++ b/app/jitsi/build/jitsi-xmpp/Dockerfile @@ -1,7 +1,16 @@ -FROM debian:buster +FROM debian:buster as builder + +ARG MEET_VERSION +WORKDIR /tmp +RUN apt-get update && \ + apt-get install -y wget unzip && \ + wget https://github.com/jitsi/jitsi-meet/archive/stable/jitsi-meet_${MEET_VERSION}.zip -O meet.zip && \ + unzip meet.zip && \ + mv jitsi-meet-* jitsi-meet -ARG VERSION +FROM debian:buster +ARG PROSODY_VERSION RUN apt-get update && \ apt-get install -y wget gnupg2 && \ echo deb http://packages.prosody.im/debian buster main \ @@ -9,7 +18,7 @@ RUN apt-get update && \ wget https://prosody.im/files/prosody-debian-packages.key -O - \ | apt-key add - && \ apt-get update && \ - apt-get install -y prosody=${VERSION} lua-event + apt-get install -y prosody=${PROSODY_VERSION} lua-event RUN mkdir -p /usr/local/share/ca-certificates/ && \ ln -sf \ @@ -20,6 +29,7 @@ RUN mkdir -p /usr/local/share/ca-certificates/ && \ mkdir -p /var/lib/prosody && \ chown -R prosody:prosody /var/lib/prosody /run/prosody +COPY --from=builder /tmp/jitsi-meet/resources/prosody-plugins /usr/share/jitsi-meet/prosody-plugins/ COPY xmpp_prosody /usr/local/bin/xmpp_prosody WORKDIR /var/lib/prosody |