diff options
| author | Quentin Dufour <quentin@deuxfleurs.fr> | 2020-03-27 23:27:52 +0100 |
|---|---|---|
| committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2020-03-27 23:27:52 +0100 |
| commit | 53ebca75b61ebd65003ee9513ca63e9c636c3b9e (patch) | |
| tree | a24f45c0e7dc4aef8c20588828949cf1fea36f6f | |
| parent | 395437ebb91aad86bd7a92514146e7661568e8d8 (diff) | |
| download | infrastructure-53ebca75b61ebd65003ee9513ca63e9c636c3b9e.tar.gz infrastructure-53ebca75b61ebd65003ee9513ca63e9c636c3b9e.zip | |
Jitsi: varioux fixes
| -rw-r--r-- | docker/jitsi/02_run.yml | 2 | ||||
| -rw-r--r-- | docker/jitsi/jitsi-videobridge/Dockerfile | 4 | ||||
| -rwxr-xr-x | docker/jitsi/jitsi-videobridge/jvb_run | 7 | ||||
| -rw-r--r-- | nomad/jitsi.hcl | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/docker/jitsi/02_run.yml b/docker/jitsi/02_run.yml index a3dcda6..018fcb7 100644 --- a/docker/jitsi/02_run.yml +++ b/docker/jitsi/02_run.yml @@ -26,7 +26,7 @@ services: volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-videobridge: build: ./jitsi-videobridge - image: superboum/amd64_jitsi_videobridge:v3 + image: superboum/amd64_jitsi_videobridge:v4 network_mode: host ports: - "4443:4443" diff --git a/docker/jitsi/jitsi-videobridge/Dockerfile b/docker/jitsi/jitsi-videobridge/Dockerfile index e34d000..b451b4d 100644 --- a/docker/jitsi/jitsi-videobridge/Dockerfile +++ b/docker/jitsi/jitsi-videobridge/Dockerfile @@ -14,8 +14,8 @@ RUN apt-get update && \ apt-get install -y openjdk-11-jdk COPY --from=builder /jvb /srv/jvb -ENV HOME=/srv/jvb -WORKDIR /srv/jvb +ENV HOME=/root +WORKDIR /root COPY jvb_run /usr/local/bin/jvb_run CMD ["/usr/local/bin/jvb_run"] diff --git a/docker/jitsi/jitsi-videobridge/jvb_run b/docker/jitsi/jitsi-videobridge/jvb_run index 7078239..1f55afd 100755 --- a/docker/jitsi/jitsi-videobridge/jvb_run +++ b/docker/jitsi/jitsi-videobridge/jvb_run @@ -5,10 +5,9 @@ ${JITSI_PROSODY_HOST} jitsi.deuxfleurs.fr conference.jitsi.deuxfleurs.fr jitsi-v 127.0.0.1 `hostname` EOF -cd /srv/jvb -mkdir -p /srv/jvb/.sip-communicator +mkdir -p /root/.sip-communicator -cat > /srv/jvb/.sip-communicator/sip-communicator.properties <<EOF +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 @@ -19,7 +18,7 @@ org.jitsi.videobridge.NAT_HARVESTER_LOCAL_ADDRESS=${JITSI_NAT_LOCAL_IP} org.jitsi.videobridge.NAT_HARVESTER_PUBLIC_ADDRESS=${JITSI_NAT_PUBLIC_IP} EOF -./jvb.sh \ +/srv/jvb/jvb.sh \ --host=${JITSI_PROSODY_HOST} \ --domain=jitsi.deuxfleurs.fr \ --port=5347 \ diff --git a/nomad/jitsi.hcl b/nomad/jitsi.hcl index e6fc964..cae7e5b 100644 --- a/nomad/jitsi.hcl +++ b/nomad/jitsi.hcl @@ -189,7 +189,7 @@ job "jitsi" { task "videobridge" { driver = "docker" config { - image = "superboum/amd64_jitsi_videobridge:v3" + image = "superboum/amd64_jitsi_videobridge:v4" network_mode = "host" port_map { video1_port = 4443 |