Merge pull request 'Upgrade jitsi build recipes to 9646' (#34) from 2024-09-12-update-jitsi into main

Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/pulls/34

9 files changed, 29 insertions, 24 deletions

diff --git a/cluster/prod/app/jitsi/build/docker-compose.yml b/cluster/prod/app/jitsi/build/docker-compose.yml
index 19c3782..5c6b23c 100644
--- a/cluster/prod/app/jitsi/build/docker-compose.yml
+++ b/cluster/prod/app/jitsi/build/docker-compose.yml
@@ -6,16 +6,17 @@ services:
       context: ./jitsi-meet
       args:
         # https://github.com/jitsi/jitsi-meet
-        MEET_TAG: stable/jitsi-meet_8252
-    image: superboum/amd64_jitsi_meet:v6
+        MEET_TAG: stable/jitsi-meet_9646
+        NODE_MAJOR_VERSION: 22
+    image: superboum/amd64_jitsi_meet:v7
 
   jitsi-conference-focus:
     build:
       context: ./jitsi-conference-focus
       args:
         # https://github.com/jitsi/jicofo
-        JICOFO_TAG: stable/jitsi-meet_8252
-    image: superboum/amd64_jitsi_conference_focus:v10
+        JICOFO_TAG: stable/jitsi-meet_9646
+    image: superboum/amd64_jitsi_conference_focus:v11
 
   jitsi-videobridge:
     build:
@@ -23,13 +24,13 @@ services:
       args:
         # https://github.com/jitsi/jitsi-videobridge
         # note: JVB is not tagged with non-stable tags
-        JVB_TAG: stable/jitsi-meet_8252
-    image: superboum/amd64_jitsi_videobridge:v21
+        JVB_TAG: stable/jitsi-meet_9646
+    image: superboum/amd64_jitsi_videobridge:v22
 
   jitsi-xmpp:
     build:
       context: ./jitsi-xmpp
       args:
-        MEET_TAG: stable/jitsi-meet_8252
-        PROSODY_VERSION: 1nightly191-1~bookworm
-    image: superboum/amd64_jitsi_xmpp:v11
+        MEET_TAG: stable/jitsi-meet_9646
+        PROSODY_VERSION: 0.12.3-1
+    image: superboum/amd64_jitsi_xmpp:v12
diff --git a/cluster/prod/app/jitsi/build/jitsi-meet/Dockerfile b/cluster/prod/app/jitsi/build/jitsi-meet/Dockerfile
index 2e629e9..32081a2 100644
--- a/cluster/prod/app/jitsi/build/jitsi-meet/Dockerfile
+++ b/cluster/prod/app/jitsi/build/jitsi-meet/Dockerfile
@@ -1,8 +1,9 @@
 FROM debian:bookworm AS builder
 
+ARG NODE_MAJOR_VERSION
 RUN apt-get update && \
     apt-get install -y curl && \
-    curl -sL https://deb.nodesource.com/setup_19.x | bash - && \
+    curl -sL https://deb.nodesource.com/setup_${NODE_MAJOR_VERSION}.x | bash - && \
     apt-get install -y git nodejs make git unzip
 
 ARG MEET_TAG
diff --git a/cluster/prod/app/jitsi/build/jitsi-videobridge/jvb_run b/cluster/prod/app/jitsi/build/jitsi-videobridge/jvb_run
index 8d595e6..f136eff 100755
--- a/cluster/prod/app/jitsi/build/jitsi-videobridge/jvb_run
+++ b/cluster/prod/app/jitsi/build/jitsi-videobridge/jvb_run
@@ -6,7 +6,7 @@ if [ -z "${JITSI_NAT_LOCAL_IP}" ]; then
 fi
 
 if [ -z "${JITSI_NAT_PUBLIC_IP}" ]; then
-  JITSI_NAT_PUBLIC_IP=$(curl https://ifconfig.me)
+  JITSI_NAT_PUBLIC_IP=$(curl -4 https://ifconfig.me)
 fi
 
 echo "NAT config: ${JITSI_NAT_LOCAL_IP} -> ${JITSI_NAT_PUBLIC_IP}"
diff --git a/cluster/prod/app/jitsi/build/jitsi-xmpp/Dockerfile b/cluster/prod/app/jitsi/build/jitsi-xmpp/Dockerfile
index 5efdee2..40cd335 100644
--- a/cluster/prod/app/jitsi/build/jitsi-xmpp/Dockerfile
+++ b/cluster/prod/app/jitsi/build/jitsi-xmpp/Dockerfile
@@ -13,8 +13,8 @@ RUN apt-get update && \
     apt-get install -y wget gnupg2 extrepo && \
     extrepo enable prosody && \
     apt-get update && \
-    apt-cache show prosody-0.12 && \
-    apt-get install -y prosody-0.12=${PROSODY_VERSION} lua-event
+    apt-cache show prosody && \
+    apt-get install -y prosody=${PROSODY_VERSION} lua-event
 
 RUN mkdir -p /usr/local/share/ca-certificates/ && \
     ln -sf \
diff --git a/cluster/prod/app/jitsi/deploy/jitsi.hcl b/cluster/prod/app/jitsi/deploy/jitsi.hcl
index 66fec76..7b78bdc 100644
--- a/cluster/prod/app/jitsi/deploy/jitsi.hcl
+++ b/cluster/prod/app/jitsi/deploy/jitsi.hcl
@@ -20,7 +20,7 @@ job "jitsi" {
     task "xmpp" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_xmpp:v11"
+        image = "superboum/amd64_jitsi_xmpp:v12"
         ports = [ "bosh_port", "xmpp_port" ]
         network_mode = "host"
         volumes = [
@@ -101,7 +101,7 @@ EOF
     task "front" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_meet:v6"
+        image = "superboum/amd64_jitsi_meet:v7"
         network_mode = "host"
         ports = [ "https_port" ]
         volumes = [
@@ -168,7 +168,7 @@ EOF
     task "jicofo" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_conference_focus:v10"
+        image = "superboum/amd64_jitsi_conference_focus:v11"
         network_mode = "host"
         volumes = [
           "secrets/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt",
@@ -208,7 +208,7 @@ EOF
     task "videobridge" {
       driver = "docker"
       config {
-        image = "superboum/amd64_jitsi_videobridge:v21"
+        image = "superboum/amd64_jitsi_videobridge:v22"
         network_mode = "host"
         ports = [ "video_port" ] 
         ulimit {
diff --git a/cluster/prod/app/jitsi/integration/README.md b/cluster/prod/app/jitsi/integration/README.md
index b45cd17..adf9526 100644
--- a/cluster/prod/app/jitsi/integration/README.md
+++ b/cluster/prod/app/jitsi/integration/README.md
@@ -52,7 +52,7 @@ But maybe this value is deprecated: the check is still here but it is not used a
 start a maintainance container
 
 ```
-docker run --rm -it -v `pwd`/prosody/certs/:/var/lib/prosody/ -v `pwd`/prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro --user root superboum/amd64_jitsi_xmpp:v11 bash
+docker run --rm -it -v `pwd`/prosody/certs/:/var/lib/prosody/ -v `pwd`/prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro --user root superboum/amd64_jitsi_xmpp:v12 bash
 ```
 
 then generate certificates from inside this container
diff --git a/cluster/prod/app/jitsi/integration/docker-compose.yml b/cluster/prod/app/jitsi/integration/docker-compose.yml
index 5e34467..1a12ee5 100644
--- a/cluster/prod/app/jitsi/integration/docker-compose.yml
+++ b/cluster/prod/app/jitsi/integration/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   jitsi-xmpp:
-    image: superboum/amd64_jitsi_xmpp:v11
+    image: superboum/amd64_jitsi_xmpp:v12
     volumes:
       - "./prosody/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua:ro"
       - "./prosody/certs/jitsi.crt:/var/lib/prosody/jitsi.crt:ro"
@@ -11,16 +11,19 @@ services:
     environment:
       - JICOFO_AUTH_PASSWORD=jicofopass
       - JVB_AUTH_PASSWORD=jvbpass
+    ports:
+      - "5222:5222/tcp"
  
   jitsi-conference-focus:
-    image: superboum/amd64_jitsi_conference_focus:v10
+    image: superboum/amd64_jitsi_conference_focus:v11
     volumes:
       - "./prosody/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt:ro"
       - "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
       - "./jicofo/jicofo.conf:/etc/jitsi/jicofo.conf:ro"
 
   jitsi-videobridge:
-    image: superboum/amd64_jitsi_videobridge:v21
+    image: superboum/amd64_jitsi_videobridge:v22
+    network_mode: "host"
     volumes:
       - "./prosody/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt:ro"
       - "./prosody/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt:ro"
@@ -31,7 +34,7 @@ services:
       - "10000:10000/udp"
 
   jitsi-meet:
-    image: superboum/amd64_jitsi_meet:v6
+    image: superboum/amd64_jitsi_meet:v7
     volumes:
       - "./prosody/certs/jitsi.crt:/etc/nginx/jitsi.crt:ro"
       - "./prosody/certs/jitsi.key:/etc/nginx/jitsi.key:ro"
diff --git a/cluster/prod/app/jitsi/integration/jvb/videobridge.conf b/cluster/prod/app/jitsi/integration/jvb/videobridge.conf
index a11edc6..dd6778b 100644
--- a/cluster/prod/app/jitsi/integration/jvb/videobridge.conf
+++ b/cluster/prod/app/jitsi/integration/jvb/videobridge.conf
@@ -62,7 +62,7 @@ videobridge {
 
       configs {
         unique-xmpp-server {
-          hostname="jitsi-xmpp"
+          hostname="172.17.0.1"
           domain = "auth.jitsi"
           username = "jvb"
           password = "jvbpass"
diff --git a/cluster/prod/app/jitsi/integration/meet/config.js b/cluster/prod/app/jitsi/integration/meet/config.js
index 97c5d4d..1ef9501 100644
--- a/cluster/prod/app/jitsi/integration/meet/config.js
+++ b/cluster/prod/app/jitsi/integration/meet/config.js
@@ -22,7 +22,7 @@ var config = {
     },
 
     // BOSH URL. FIXME: use XEP-0156 to discover it.
-    bosh: '//192.168.1.143/http-bind',
+    bosh: '//[2a0c:e303:0:2a00::de6]/http-bind',
 
     // Websocket URL
     // websocket: 'wss://jitsi-meet.example.com/xmpp-websocket',