diff options
| author | Quentin Dufour <quentin@deuxfleurs.fr> | 2020-04-26 23:07:01 +0200 |
|---|---|---|
| committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2020-04-26 23:07:01 +0200 |
| commit | 7a5a701bbf8abcfec6f6364687696581186bb8a3 (patch) | |
| tree | 6d63dd7f542f5ceb4ec27175975da76cfca21a0c /docker/jitsi/jitsi-videobridge | |
| parent | 1c4bc090fc737662740260a6ad88709b87d1b83c (diff) | |
| download | infrastructure-7a5a701bbf8abcfec6f6364687696581186bb8a3.tar.gz infrastructure-7a5a701bbf8abcfec6f6364687696581186bb8a3.zip | |
Upgrade jitsi
Diffstat (limited to 'docker/jitsi/jitsi-videobridge')
| -rw-r--r-- | docker/jitsi/jitsi-videobridge/Dockerfile | 16 | ||||
| -rwxr-xr-x | docker/jitsi/jitsi-videobridge/jvb_run | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/docker/jitsi/jitsi-videobridge/Dockerfile b/docker/jitsi/jitsi-videobridge/Dockerfile index b451b4d..16f59dc 100644 --- a/docker/jitsi/jitsi-videobridge/Dockerfile +++ b/docker/jitsi/jitsi-videobridge/Dockerfile @@ -1,21 +1,27 @@ FROM debian:buster AS builder RUN apt-get update && \ - apt-get install -y wget unzip + apt-get install -y wget unzip maven openjdk-11-jdk -ENV VERSION=1132 -RUN wget https://download.jitsi.org/jitsi-videobridge/linux/jitsi-videobridge-linux-x64-${VERSION}.zip -O jvb.zip && \ +ENV VERSION=4468 +RUN wget https://github.com/jitsi/jitsi-videobridge/archive/stable/jitsi-meet_${VERSION}.zip -O jvb.zip && \ unzip jvb.zip && \ - mv jitsi-videobridge-linux-x64-${VERSION} jvb + mv jitsi-videobridge-stable-jitsi-meet_${VERSION} jvb && \ + cd jvb && \ + mvn package -DskipTests && \ + unzip target/jitsi-videobridge-*.zip && \ + mv jitsi-videobridge-*-SNAPSHOT build FROM debian:buster RUN apt-get update && \ apt-get install -y openjdk-11-jdk -COPY --from=builder /jvb /srv/jvb +COPY --from=builder /jvb/build /srv/jvb ENV HOME=/root WORKDIR /root COPY jvb_run /usr/local/bin/jvb_run +ENV JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/root -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=.sip-communicator -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi" + CMD ["/usr/local/bin/jvb_run"] diff --git a/docker/jitsi/jitsi-videobridge/jvb_run b/docker/jitsi/jitsi-videobridge/jvb_run index 64d36f2..3352e8a 100755 --- a/docker/jitsi/jitsi-videobridge/jvb_run +++ b/docker/jitsi/jitsi-videobridge/jvb_run @@ -11,11 +11,13 @@ cat > /root/.sip-communicator/sip-communicator.properties <<EOF org.jitsi.impl.neomedia.transform.srtp.SRTPCryptoContext.checkReplay=false # The videobridge uses 443 by default with 4443 as a fallback, but since we're already # running nginx on 443 in this example doc, we specify 4443 manually to avoid a race condition -org.jitsi.videobridge.TCP_HARVESTER_PORT=${JITSI_VIDEO_TCP} +org.ice4j.ice.harvest.TCP_HARVESTER_PORT=${JITSI_VIDEO_TCP} org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=${JITSI_NAT_LOCAL_IP} org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_IP} +org.jitsi.videobridge.TCP_HARVESTER_PORT=${JITSI_VIDEO_TCP} org.jitsi.videobridge.NAT_HARVESTER_LOCAL_ADDRESS=${JITSI_NAT_LOCAL_IP} org.jitsi.videobridge.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_IP} +org.jitsi.videobridge.DISABLE_TCP_HARVESTER=false EOF [ -v JITSI_DEBUG ] && cat >> /root/.sip-communicator/sip-communicator.properties <<EOF |