Trying to switch on a development version

This commit is contained in:
Quentin 2021-01-28 21:47:35 +01:00
parent 47bcdaaf0d
commit 5b53cf1673
7 changed files with 31 additions and 16 deletions

View file

@ -48,8 +48,8 @@ services:
args:
# https://github.com/jitsi/jitsi-meet
PREFIXV: stable/jitsi-meet_
VERSION: 5390
image: superboum/amd64_jitsi_meet:v3
VERSION: 5463
image: superboum/amd64_jitsi_meet:v4
jitsi-conference-focus:
build:
@ -57,7 +57,7 @@ services:
args:
# https://github.com/jitsi/jicofo
PREFIXV: stable/jitsi-meet_
VERSION: 5390
VERSION: 5463
image: superboum/amd64_jitsi_conference_focus:v7
jitsi-videobridge:
@ -66,14 +66,14 @@ services:
args:
# https://github.com/jitsi/jitsi-videobridge
PREFIXV: stable/jitsi-meet_
VERSION: 5390
VERSION: 5463
image: superboum/amd64_jitsi_videobridge:v17
jitsi-xmpp:
build:
context: ./jitsi/build/jitsi-xmpp
args:
MEET_VERSION: 5390
MEET_VERSION: 5463
PROSODY_VERSION: 0.11.7-1~buster4
image: superboum/amd64_jitsi_xmpp:v9

View file

@ -3,9 +3,9 @@ FROM debian:buster AS builder
ARG PREFIXV
ARG VERSION
RUN apt-get update && \
apt-get install -y openjdk-11-jdk maven wget unzip && \
wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip
apt-get install -y openjdk-11-jdk-headless maven wget unzip
RUN wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip
RUN unzip jicofo.zip && \
mv jicofo*${VERSION} jicofo && \
cd jicofo && \
@ -20,6 +20,5 @@ RUN apt-get update && \
COPY --from=builder /srv/build /usr/share/jicofo
COPY jicofo /usr/local/bin
ENV JICOFO_SECRET=IAMDEPRECATED
CMD ["/usr/local/bin/jicofo"]

View file

@ -1,3 +1,9 @@
#!/bin/bash
cat /etc/prosody/accounts.txt | xargs -n3 prosodyctl register
prosodyctl register focus auth.jitsi ${JICOFO_AUTH_PASSWORD}
prosodyctl register jvb auth.jitsi ${JVB_AUTH_PASSWORD}
# copied from jitsi-meet.postinst
# Make sure the focus@auth user's roster includes the proxy component (this is idempotent)
prosodyctl mod_roster_command subscribe focus.jitsi focus@auth.jitsi
exec prosody

View file

@ -4,16 +4,28 @@ services:
image: superboum/amd64_jitsi_xmpp:v9
volumes:
- "./prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro"
- "./prosody/accounts.txt:/etc/prosody/accounts.txt:ro"
- "./prosody/certs/jitsi.crt:/var/lib/prosody/jitsi.crt:ro"
- "./prosody/certs/jitsi.key:/var/lib/prosody/jitsi.key:ro"
- "./prosody/certs/auth.jitsi.crt:/var/lib/prosody/auth.jitsi.crt:ro"
- "./prosody/certs/auth.jitsi.key:/var/lib/prosody/auth.jitsi.key:ro"
environment:
- JICOFO_AUTH_PASSWORD=jicofopass
- JVB_AUTH_PASSWORD=jvbpass
jitsi-conference-focus:
image: superboum/amd64_jitsi_conference_focus:v7
volumes:
- "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
- "./jicofo/jicofo.conf:/etc/jitsi/jicofo.conf:ro"
# environment:
# - JDOMAIN=jitsi
# - JHOST=jitsi-xmpp
# - JPORT=5347
# - JSUBDOMAIN=focus
# - JICOFO_SECRET=jicofosecretpass
# - JUSERDOMAIN=auth.jitsi
# - JUSERNAME=focus@auth.jitsi
# - JICOFO_AUTH_PASSWORD=jicofopass
# jitsi-meet:
# image: superboum/amd64_jitsi_meet:v1
# ports:

View file

@ -242,8 +242,8 @@ jicofo {
hostname = "jitsi-xmpp"
port = 5222
domain = "auth.jitsi"
username = "focus"
password = "xxx"
username = "focus@auth.jitsi"
password = "jicofopass"
// How long to wait for a response to a stanza before giving up.
reply-timeout = 15 seconds
@ -261,7 +261,7 @@ jicofo {
port = 5222
domain = "auth.jitsi"
username = "focus"
password = "xxx"
password = "jicofopass"
// How long to wait for a response to a stanza before giving up.
reply-timeout = 15 seconds

View file

@ -1,2 +0,0 @@
focus auth.jitsi xxx
jvb auth.jitsi yyy

View file

@ -85,7 +85,7 @@ VirtualHost "auth.jitsi"
authentication = "internal_plain"
Component "focus.jitsi"
component_secret = "focusSecret"
component_secret = "jicofosecretpass"
Component "speakerstats.jitsi" "speakerstats_component"
muc_component = "conference.jitsi"