Merge tag 'tags/stable-10741' into openshift

guillaumevillemont · guillaumevillemont · commit 2d48b2f76980 · 2026-03-05T09:28:02.000+01:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-10741}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -32,6 +32,7 @@ services:
             - COLIBRI_WEBSOCKET_REGEX
             - CONFCODE_URL
             - CORS_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN
+            - CSP_HEADER
             - DEFAULT_LANGUAGE
             - DEPLOYMENTINFO_ENVIRONMENT
             - DEPLOYMENTINFO_ENVIRONMENT_TYPE
@@ -191,7 +192,7 @@ services:
 
                 # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-10741}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -317,6 +318,7 @@ services:
             - VISITORS_XMPP_DOMAIN
             - VISITORS_XMPP_SERVER
             - VISITORS_XMPP_PORT
+            - WAIT_FOR_HOST_DISABLE_AUTO_OWNERS
             - XMPP_BREAKOUT_MUC_MODULES
             - XMPP_CONFIGURATION
             - XMPP_DOMAIN
@@ -341,7 +343,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-10741}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -438,7 +440,7 @@ services:
 
                 # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-10741}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
diff --git a/etherpad.yml b/etherpad.yml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
     # Etherpad: real-time collaborative document editing
     etherpad:
diff --git a/grafana.yml b/grafana.yml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   # Grafana: used for visualization of metrics and log data through customizable dashboards.
   grafana:
diff --git a/jibri.yml b/jibri.yml
@@ -1,8 +1,6 @@
-version: '3.5'
-
 services:
     jibri:
-        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-10741}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jibri/Dockerfile b/jibri/Dockerfile
@@ -11,7 +11,7 @@ LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 ARG USE_CHROMIUM=0
 #ARG CHROME_RELEASE=latest
 # https://googlechromelabs.github.io/chrome-for-testing/
-ARG CHROME_RELEASE=130.0.6723.116
+ARG CHROME_RELEASE=143.0.7499.40
 
 COPY rootfs/ /
 
@@ -30,7 +30,8 @@ RUN apt-dpkg-wrap apt-get update && \
         unzip \
         fonts-noto \
         fonts-noto-cjk \
-        libcap2-bin && \
+        libcap2-bin \
+        rclone && \
     /usr/bin/install-chrome.sh && \
     apt-cleanup && \
     adduser jibri rtkit && \
diff --git a/jigasi.yml b/jigasi.yml
@@ -1,9 +1,7 @@
-version: '3.5'
-
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10741}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'
diff --git a/jigasi/rootfs/usr/bin/init_jitsi_jigasi b/jigasi/rootfs/usr/bin/init_jitsi_jigasi
@@ -102,4 +102,6 @@ if [[ -f /config/custom-sip-communicator.properties ]]; then
 fi
 if [[ -f /config/custom-logging.properties ]]; then
     cat /config/custom-logging.properties >> /config/logging.properties
-fi
+fi
+
+chown jigasi /config -R
diff --git a/jvb/rootfs/defaults/jvb.conf b/jvb/rootfs/defaults/jvb.conf
@@ -1,5 +1,5 @@
 {{ $COLIBRI_REST_ENABLED := .Env.COLIBRI_REST_ENABLED | default "false" | toBool -}}
-{{ $DISABLE_AWS_HARVESTER := .Env.DISABLE_AWS_HARVESTER | default "false" | toBool -}}
+{{ $DISABLE_AWS_HARVESTER := .Env.DISABLE_AWS_HARVESTER | default "true" | toBool -}}
 {{ $DISABLE_XMPP := .Env.JVB_DISABLE_XMPP | default "0" | toBool -}}
 {{ $ENABLE_COLIBRI_WEBSOCKET := .Env.ENABLE_COLIBRI_WEBSOCKET | default "0" | toBool -}}
 {{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool -}}
diff --git a/log-analyser.yml b/log-analyser.yml
@@ -1,10 +1,7 @@
-version: '3.5'
-
 services:
   # Log Analyser: used for setting up a log analysis system for visualization, log collection and log processing.
 
   loki:
-    container_name: loki
     image: grafana/loki:3.0.0
     command: -config.file=/conf/loki-config.yaml
     volumes:
@@ -15,8 +12,7 @@ services:
     networks:
       meet.jitsi:
 
-  otel-collector:
-    container_name: otel
+  otel:
     image: otel/opentelemetry-collector-contrib:0.130.0
     user: "0" # required for reading docker container logs
     volumes:
diff --git a/prosody/Dockerfile b/prosody/Dockerfile
@@ -30,14 +30,15 @@ LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 ARG VERSION_JITSI_CONTRIB_PROSODY_PLUGINS="20250923"
 ARG VERSION_MATRIX_USER_VERIFICATION_SERVICE_PLUGIN="1.8.0"
 ARG PROSODY_PACKAGE="prosody"
+ARG PROSODY_PACKAGE_VERSION="13.*"
 
 RUN set -x && \
     wget -qO /etc/apt/trusted.gpg.d/prosody.gpg https://prosody.im/files/prosody-debian-packages.key && \
     echo "deb http://packages.prosody.im/debian bookworm main" > /etc/apt/sources.list.d/prosody.list && \
     apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get install -y \
       lua5.4 \
-      $PROSODY_PACKAGE \
+      $PROSODY_PACKAGE=$PROSODY_PACKAGE_VERSION \
       libldap-common \
       sasl2-bin \
       libsasl2-modules-ldap \
@@ -65,7 +66,8 @@ RUN set -x && \
     tar -xf v$VERSION_JITSI_CONTRIB_PROSODY_PLUGINS.tar.gz && \
     mkdir /prosody-plugins-contrib && \
     cp -a prosody-plugins-$VERSION_JITSI_CONTRIB_PROSODY_PLUGINS/*  /prosody-plugins-contrib && \
-    rm -rf prosody-plugins-$VERSION_JITSI_CONTRIB_PROSODY_PLUGINS v$VERSION_JITSI_CONTRIB_PROSODY_PLUGINS.tar.gz
+    rm -rf prosody-plugins-$VERSION_JITSI_CONTRIB_PROSODY_PLUGINS v$VERSION_JITSI_CONTRIB_PROSODY_PLUGINS.tar.gz && \
+    (apt-cache policy prosody | grep -Eq "13\.0\.[34]" && sed -i '/idna_to_ascii/d' /usr/share/lua/5.4/prosody/util/jid.lua || true)
 
 COPY rootfs/ /
 
diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -42,6 +42,7 @@
 {{ $RATE_LIMIT_LOGIN_RATE := .Env.PROSODY_RATE_LIMIT_LOGIN_RATE | default "3" -}}
 {{ $RATE_LIMIT_SESSION_RATE := .Env.PROSODY_RATE_LIMIT_SESSION_RATE | default "200" -}}
 {{ $RATE_LIMIT_TIMEOUT := .Env.PROSODY_RATE_LIMIT_TIMEOUT | default "60" -}}
+{{ $WAIT_FOR_HOST_DISABLE_AUTO_OWNERS := .Env.WAIT_FOR_HOST_DISABLE_AUTO_OWNERS | default "false" | toBool -}}
 {{ $XMPP_AUTH_DOMAIN := .Env.XMPP_AUTH_DOMAIN | default "auth.meet.jitsi" -}}
 {{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN | default "meet.jitsi" -}}
 {{ $XMPP_GUEST_DOMAIN := .Env.XMPP_GUEST_DOMAIN | default "guest.meet.jitsi" -}}
@@ -68,13 +69,15 @@ unlimited_jids = {
     "{{ $JVB_AUTH_USER }}@{{ $XMPP_AUTH_DOMAIN }}"
 }
 
-plugin_paths = { "/prosody-plugins/", "/prosody-plugins-custom", "/prosody-plugins-contrib" }
+plugin_paths = { "/prosody-plugins-custom", "/prosody-plugins/", "/prosody-plugins-contrib" }
 
 muc_mapper_domain_base = "{{ $XMPP_DOMAIN }}";
 muc_mapper_domain_prefix = "{{ $XMPP_MUC_DOMAIN_PREFIX }}";
 
 recorder_prefixes = { "{{ $JIBRI_RECORDER_USER }}@{{ $XMPP_HIDDEN_DOMAIN }}" };
 
+transcriber_prefixes = { "{{ $JIGASI_TRANSCRIBER_USER }}@{{ $XMPP_HIDDEN_DOMAIN }}" };
+
 http_default_host = "{{ $XMPP_DOMAIN }}"
 
 {{ if and $ENABLE_AUTH (or (eq $PROSODY_AUTH_TYPE "jwt") (eq $PROSODY_AUTH_TYPE "hybrid_matrix_token")) .Env.JWT_ACCEPTED_ISSUERS }}
@@ -364,7 +367,7 @@ Component "{{ $XMPP_MUC_DOMAIN }}" "muc"
     }
     {{ end -}}
 
-	-- The size of the cache that saves state for IP addresses
+    -- The size of the cache that saves state for IP addresses
     rate_limit_cache_size = {{ $RATE_LIMIT_CACHE_SIZE }};
 
     muc_room_cache_size = 10000
@@ -387,16 +390,20 @@ Component "{{ $XMPP_MUC_DOMAIN }}" "muc"
     {{ end }}
     muc_password_whitelist = {
         "focus@{{ $XMPP_AUTH_DOMAIN }}";
-{{- if $ENABLE_RECORDING }}
+        {{- if $ENABLE_RECORDING }}
         "{{ $JIBRI_RECORDER_USER }}@{{ $XMPP_HIDDEN_DOMAIN }}";
-{{- end }}
-{{- if $ENABLE_TRANSCRIPTIONS }}
+        {{- end }}
+        {{- if $ENABLE_TRANSCRIPTIONS }}
         "{{ $JIGASI_TRANSCRIBER_USER }}@{{ $XMPP_HIDDEN_DOMAIN }}";
-{{- end }}
+        {{- end }}
     }
     muc_tombstones = false
     muc_room_allow_persistent = false
 
+    {{- if $WAIT_FOR_HOST_DISABLE_AUTO_OWNERS }}
+    wait_for_host_disable_auto_owners = true
+    {{- end }}
+
 Component "focus.{{ $XMPP_DOMAIN }}" "client_proxy"
     target_address = "focus@{{ $XMPP_AUTH_DOMAIN }}"
 
diff --git a/prosody/rootfs/defaults/prosody.cfg.lua b/prosody/rootfs/defaults/prosody.cfg.lua
@@ -90,6 +90,12 @@ modules_enabled = {
 		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
 		"tls"; -- Add support for secure TLS on c2s/s2s connections
 		"disco"; -- Service discovery
+
+	-- Admin interfaces
+		"admin_shell"; -- Enable admin shell for prosodyctl shell commands
+		-- "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+
 {{- if eq $PROSODY_MODE "client" }}
 	-- Not essential, but recommended
 		"private"; -- Private XML storage (for room bookmarks, etc.)
@@ -99,10 +105,6 @@ modules_enabled = {
 		--"privacy"; -- Support privacy lists
 		--"compression"; -- Stream compression (Debian: requires lua-zlib module to work)
 
-	-- Admin interfaces
-		-- "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
-		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
-
 	-- Nice to have
 		"version"; -- Replies to server version requests
 {{- end }}
diff --git a/prosody/rootfs/etc/services.d/70-register-setup/run b/prosody/rootfs/etc/services.d/70-register-setup/run
diff --git a/prosody/rootfs/usr/bin/init_jitsi_prosody b/prosody/rootfs/usr/bin/init_jitsi_prosody
diff --git a/transcriber.yml b/transcriber.yml
diff --git a/web/rootfs/defaults/meet.conf b/web/rootfs/defaults/meet.conf
diff --git a/whiteboard.yml b/whiteboard.yml

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-version: '3.5'`
`2`		`-`
`3`	`1`	`services:`
`4`	`2`	`# Etherpad: real-time collaborative document editing`
`5`	`3`	`etherpad:`