diff options
| -rw-r--r-- | docker/jitsi/02_run.yml | 14 | ||||
| -rw-r--r-- | docker/jitsi/dev.env | 2 | ||||
| -rw-r--r-- | docker/jitsi/jitsi-conference-focus/Dockerfile | 16 | ||||
| -rw-r--r-- | docker/jitsi/jitsi-videobridge/Dockerfile | 16 | ||||
| -rwxr-xr-x | docker/jitsi/jitsi-videobridge/jvb_run | 4 | ||||
| -rw-r--r-- | nomad/jitsi.hcl | 4 |
6 files changed, 33 insertions, 23 deletions
diff --git a/docker/jitsi/02_run.yml b/docker/jitsi/02_run.yml index b87f376..8d0fe75 100644 --- a/docker/jitsi/02_run.yml +++ b/docker/jitsi/02_run.yml @@ -16,20 +16,22 @@ services: #network: host #^-- I have some DNS problems on Fedora 32 in Docker image: superboum/amd64_jitsi_front:v4 - network_mode: host ports: - "443:443" env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-conference-focus: - build: ./jitsi-conference-focus - image: superboum/amd64_jitsi_conference_focus:v1 - network_mode: host + build: + context: ./jitsi-conference-focus + network: host + image: superboum/amd64_jitsi_conference_focus:v2 env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-videobridge: - build: ./jitsi-videobridge - image: superboum/amd64_jitsi_videobridge:v6 + build: + context: ./jitsi-videobridge + network: host + image: superboum/amd64_jitsi_videobridge:v9 network_mode: host ports: - "8080:8080/tcp" diff --git a/docker/jitsi/dev.env b/docker/jitsi/dev.env index 9a94a81..4fff8c1 100644 --- a/docker/jitsi/dev.env +++ b/docker/jitsi/dev.env @@ -7,4 +7,4 @@ JITSI_PROSODY_HOST=127.0.0.1 JITSI_CERTS_FOLDER=/certs/ JITSI_NAT_PUBLIC_IP=77.204.7.239 JITSI_NAT_LOCAL_IP=192.168.0.18 -JITSI_VIDEO_TCP=995 +JITSI_VIDEO_TCP=8080 diff --git a/docker/jitsi/jitsi-conference-focus/Dockerfile b/docker/jitsi/jitsi-conference-focus/Dockerfile index 190010e..7b6410a 100644 --- a/docker/jitsi/jitsi-conference-focus/Dockerfile +++ b/docker/jitsi/jitsi-conference-focus/Dockerfile @@ -1,22 +1,22 @@ FROM debian:buster AS builder +ENV VERSION=4510 RUN apt-get update && \ - apt-get install -y openjdk-11-jdk maven git unzip && \ - git clone --depth=1 https://github.com/jitsi/jicofo.git && \ + apt-get install -y openjdk-11-jdk maven wget unzip && \ + wget https://github.com/jitsi/jicofo/archive/jitsi-meet_${VERSION}.zip -O jicofo.zip && \ + unzip jicofo.zip && \ + mv jicofo-jitsi-meet_${VERSION} jicofo && \ cd jicofo && \ - mvn package -DskipTests -Dassembly.skipAssembly=false - -RUN cd jicofo && \ + mvn package -DskipTests -Dassembly.skipAssembly=false && \ unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \ - mv jicofo-1.1-SNAPSHOT /srv/jicofo - + mv jicofo-1.1-SNAPSHOT /srv/build FROM debian:buster RUN apt-get update && \ apt-get install -y openjdk-11-jdk ca-certificates -COPY --from=builder /srv/jicofo /srv/jicofo +COPY --from=builder /srv/build /srv/jicofo COPY jicofo /usr/local/bin/jicofo CMD ["/usr/local/bin/jicofo"] 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 diff --git a/nomad/jitsi.hcl b/nomad/jitsi.hcl index bcfab06..b0ccb3a 100644 --- a/nomad/jitsi.hcl +++ b/nomad/jitsi.hcl @@ -157,7 +157,7 @@ job "jitsi" { task "jicofo" { driver = "docker" config { - image = "superboum/amd64_jitsi_conference_focus:v1" + image = "superboum/amd64_jitsi_conference_focus:v2" network_mode = "host" } @@ -189,7 +189,7 @@ job "jitsi" { task "videobridge" { driver = "docker" config { - image = "superboum/amd64_jitsi_videobridge:v6" + image = "superboum/amd64_jitsi_videobridge:v9" network_mode = "host" port_map { video1_port = 8080 |