From 59ca97e2a97c77719aa139748caff4a40e6d2704 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Fri, 29 Jan 2021 18:59:19 +0100 Subject: Migrate JVB to the new packaging --- app/docker-compose.yml | 4 +- app/jitsi/build/jitsi-videobridge/Dockerfile | 11 ++--- app/jitsi/build/jitsi-videobridge/jvb_run | 66 ++++++---------------------- app/jitsi/integration/docker-compose.yml | 17 ++++--- app/jitsi/integration/jvb/videobridge.conf | 10 +++++ 5 files changed, 41 insertions(+), 67 deletions(-) diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 9f50c26..24ba0ba 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -65,8 +65,8 @@ services: context: ./jitsi/build/jitsi-videobridge args: # https://github.com/jitsi/jitsi-videobridge - PREFIXV: jitsi-meet_ - VERSION: 5463 + PREFIXV: stable/jitsi-meet_ + VERSION: 5390 image: superboum/amd64_jitsi_videobridge:v17 jitsi-xmpp: diff --git a/app/jitsi/build/jitsi-videobridge/Dockerfile b/app/jitsi/build/jitsi-videobridge/Dockerfile index c17fb4f..4067992 100644 --- a/app/jitsi/build/jitsi-videobridge/Dockerfile +++ b/app/jitsi/build/jitsi-videobridge/Dockerfile @@ -4,8 +4,9 @@ ARG PREFIXV ARG VERSION RUN apt-get update && \ - apt-get install -y wget unzip maven openjdk-11-jdk && \ - wget https://github.com/jitsi/jitsi-videobridge/archive/${PREFIXV}${VERSION}.zip -O jvb.zip + apt-get install -y wget unzip maven openjdk-11-jdk-headless + +RUN wget https://github.com/jitsi/jitsi-videobridge/archive/${PREFIXV}${VERSION}.zip -O jvb.zip RUN unzip jvb.zip && \ mv jitsi-videobridge*${VERSION} jvb && \ @@ -20,11 +21,7 @@ FROM debian:buster RUN apt-get update && \ apt-get install -y openjdk-11-jre-headless -COPY --from=builder /jvb/build /srv/jvb -ENV HOME=/root -WORKDIR /root +COPY --from=builder /jvb/build /usr/share/jvb 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/app/jitsi/build/jitsi-videobridge/jvb_run b/app/jitsi/build/jitsi-videobridge/jvb_run index b86c911..4c90bea 100755 --- a/app/jitsi/build/jitsi-videobridge/jvb_run +++ b/app/jitsi/build/jitsi-videobridge/jvb_run @@ -1,54 +1,14 @@ #!/bin/bash - -cat >> /etc/hosts < /root/.sip-communicator/sip-communicator.properties <> /root/.sip-communicator/sip-communicator.properties <