Merge branch 'master' into openshift

.github/workflows/docker-publish-individual.yml

@@ -6,6 +6,14 @@ on:
       folder:
         required: true
         type: string
+      repository:
+        required: false
+        type: string
+        default: ""
+      ref:
+        required: false
+        type: string
+        default: ""
     secrets:
       github-token:
         required: true
@@ -25,26 +33,34 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    - name: Checkout other repository
+      uses: actions/checkout@v4
+      with:
+        repository: ${{ inputs.repository }}
+        ref: ${{ inputs.ref }}
+        path: ${{ inputs.folder }}
+      if: ${{ inputs.repository != '' }}
 
     - name: Log into registry ${{ env.REGISTRY }}
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ github.actor }}
         password: ${{ secrets.github-token }}
 
     - name: Extract Docker metadata
       id: meta
-      uses: docker/metadata-action@v4
+      uses: docker/metadata-action@v5
       with:
         images: ${{ env.REGISTRY_BASE_PATH }}/${{ inputs.folder }}
         # Turn off auto-latest, as we want to exclude openshift tags from that
         flavor: |
           latest=false
 
     - name: Build and push Docker image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: "${{ inputs.folder }}"
         push: ${{ github.event_name != 'pull_request' }}

.github/workflows/docker-publish.yml

@@ -84,3 +84,12 @@ jobs:
       folder: web
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  build-push-excalidraw:
+    uses: ./.github/workflows/docker-publish-individual.yml
+    with:
+      folder: excalidraw-backend
+      repository: jitsi/excalidraw-backend
+      ref: "x21"
+    secrets:
+      github-token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,44 @@
+## stable-9364-1
+
+Based on stable release 9364-1.
+
+* a5ebb99 jibri: flag to support prometheus-style metrics (#1768)
+* 80fc10e feat(prosody): Cleans up gc settings.
+* 69bba17 feat(prosody): Adjusts lua to use generational GC for brewery.cfg.lua.
+* 2798426 feat(prosody): Adjusts lua to use generational GC.
+* 28d2b32 feat(prosody): Make sure muc tumbstones is disabled.
+* d5df19d jigasi: autoscaler sidecar support (#1738)
+* 0953ca0 jigasi: skip SIP configuration when configured as a transcriber
+* ca1d670 fix: :bug: wrong quote in default config (#1761)
+* 360361e jibri: move xmpp config for easier override (#1748)
+* 452f5ba misc: working on unstable
+
+## stable-9364
+
+Based on stable release 9364.
+
+* ca61ea2 jibri: add ability to ignore certificate errors
+* 615396e java: use Java 17
+* 140db22 jibri: check for chrome bin before pre-warm (#1757)
+* 648612f feat(prosody): Always report visitors support when enabled.
+* 28f3cf8 jvb: lipcap from apt to allow for pcap dumps (#1747)
+* 33350c3 prosody: fix env var default value
+* d6dc1e3 base-java: install nodejs 20 from nodesource
+* 8f84f2f jibri: use storage.googleapis.com location for chromedriver
+* 1bbb4ab fix(prosody): Updates a rate whitelist config that changed in jitsi-meet. (#1741)
+* eccf68e misc: working on unstable
+
+## stable-9258
+
+Based on stable release 9258.
+
+* a198d56 compose: add jvb dependency to web container (#1739)
+* 5c5742b prosody: var for speakerstats modules
+* a1d1f2c web: Add env vars for setting 1080p and 4k bitrates.
+* bb69407 Remove "ping" in ViarualHosts (#1728)
+* 14efd9c prosody: disable "offline" and "register" modules. (#1727)
+* 8e28256 misc: working on unstable
+
 ## stable-9220-1
 
 Based on stable release 9220-1.

base-java/Dockerfile

@@ -3,6 +3,11 @@ ARG BASE_TAG=latest
 FROM ${JITSI_REPO}/base:${BASE_TAG}
 
 RUN mkdir -p /usr/share/man/man1 && \
+    mkdir -p /etc/apt/keyrings/ && \
     apt-dpkg-wrap apt-get update && \
-    apt-dpkg-wrap apt-get install -y openjdk-11-jre-headless openjdk-11-jdk-headless && \
+    apt-dpkg-wrap apt-get install -y unzip ca-certificates curl gnupg && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
+    apt-dpkg-wrap apt-get update && \
+    apt-dpkg-wrap apt-get install -y nodejs openjdk-17-jre-headless openjdk-17-jdk-headless && \
     apt-cleanup

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9220-1}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9364-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -141,18 +141,26 @@ services:
             - VIDEOQUALITY_BITRATE_H264_LOW
             - VIDEOQUALITY_BITRATE_H264_STANDARD
             - VIDEOQUALITY_BITRATE_H264_HIGH
+            - VIDEOQUALITY_BITRATE_H264_FULL
+            - VIDEOQUALITY_BITRATE_H264_ULTRA
             - VIDEOQUALITY_BITRATE_H264_SS_HIGH
             - VIDEOQUALITY_BITRATE_VP8_LOW
             - VIDEOQUALITY_BITRATE_VP8_STANDARD
             - VIDEOQUALITY_BITRATE_VP8_HIGH
+            - VIDEOQUALITY_BITRATE_VP8_FULL
+            - VIDEOQUALITY_BITRATE_VP8_ULTRA
             - VIDEOQUALITY_BITRATE_VP8_SS_HIGH
             - VIDEOQUALITY_BITRATE_VP9_LOW
             - VIDEOQUALITY_BITRATE_VP9_STANDARD
             - VIDEOQUALITY_BITRATE_VP9_HIGH
+            - VIDEOQUALITY_BITRATE_VP9_FULL
+            - VIDEOQUALITY_BITRATE_VP9_ULTRA
             - VIDEOQUALITY_BITRATE_VP9_SS_HIGH
             - VIDEOQUALITY_BITRATE_AV1_LOW
             - VIDEOQUALITY_BITRATE_AV1_STANDARD
             - VIDEOQUALITY_BITRATE_AV1_HIGH
+            - VIDEOQUALITY_BITRATE_AV1_FULL
+            - VIDEOQUALITY_BITRATE_AV1_ULTRA
             - VIDEOQUALITY_BITRATE_AV1_SS_HIGH
             - VIDEOQUALITY_PREFERRED_CODEC
             - XMPP_AUTH_DOMAIN
@@ -166,10 +174,12 @@ services:
             - WHITEBOARD_COLLAB_SERVER_PUBLIC_URL
         networks:
             meet.jitsi:
+        depends_on:
+            - jvb
 
                 # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9220-1}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9364-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -293,14 +303,15 @@ services:
             - XMPP_RECORDER_DOMAIN
             - XMPP_PORT
             - XMPP_SERVER_S2S_PORT
+            - XMPP_SPEAKERSTATS_MODULES
         networks:
             meet.jitsi:
                 aliases:
                     - ${XMPP_SERVER:-xmpp.meet.jitsi}
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9220-1}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9364-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -383,7 +394,7 @@ services:
 
                 # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9220-1}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9364-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'

jibri.yml

@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     jibri:
-        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-9220-1}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-9364-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z
@@ -26,8 +26,10 @@ services:
             - DISPLAY=:0
             - ENABLE_STATS_D
             - ICE_CONNECTION_TIMEOUT
+            - IGNORE_CERTIFICATE_ERRORS
             - JIBRI_WEBHOOK_SUBSCRIBERS
             - JIBRI_INSTANCE_ID
+            - JIBRI_ENABLE_PROMETHEUS
             - JIBRI_HTTP_API_EXTERNAL_PORT
             - JIBRI_HTTP_API_INTERNAL_PORT
             - JIBRI_RECORDING_RESOLUTION

jibri/rootfs/defaults/jibri.conf

@@ -1,29 +1,13 @@
-{{ $JIBRI_XMPP_USER := .Env.JIBRI_XMPP_USER | default "jibri" -}}
-{{ $JIBRI_RECORDER_USER := .Env.JIBRI_RECORDER_USER | default "recorder" -}}
-{{ $JIBRI_USAGE_TIMEOUT := .Env.JIBRI_USAGE_TIMEOUT | default "0" -}}
+{{ $ENABLE_PROMETHEUS := .Env.JIBRI_ENABLE_PROMETHEUS | default "false" | toBool -}}
 {{ $JIBRI_RECORDING_RESOLUTION := .Env.JIBRI_RECORDING_RESOLUTION | default "1280x720" -}}
 {{ $JIBRI_RECORDING_VIDEO_ENCODE_PRESET := .Env.JIBRI_RECORDING_VIDEO_ENCODE_PRESET | default "veryfast" -}}
 {{ $JIBRI_RECORDING_CONSTANT_RATE_FACTOR := .Env.JIBRI_RECORDING_CONSTANT_RATE_FACTOR | default 25 -}}
 {{ $JIBRI_RECORDING_FRAMERATE := .Env.JIBRI_RECORDING_FRAMERATE | default 30 -}}
 {{ $JIBRI_RECORDING_QUEUE_SIZE := .Env.JIBRI_RECORDING_QUEUE_SIZE | default 4096 -}}
 {{ $JIBRI_RECORDING_STREAMING_MAX_BITRATE := .Env.JIBRI_RECORDING_STREAMING_MAX_BITRATE | default 2976 -}}
-{{ $JIBRI_BREWERY_MUC := .Env.JIBRI_BREWERY_MUC | default "jibribrewery" -}}
 {{ $JIBRI_SINGLE_USE_MODE := .Env.JIBRI_SINGLE_USE_MODE | default "false" -}}
-{{ $XMPP_AUTH_DOMAIN := .Env.XMPP_AUTH_DOMAIN | default "auth.meet.jitsi" -}}
-{{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN | default "meet.jitsi" -}}
-{{ $XMPP_INTERNAL_MUC_DOMAIN := .Env.XMPP_INTERNAL_MUC_DOMAIN | default "internal-muc.meet.jitsi" -}}
-{{ $XMPP_MUC_DOMAIN := .Env.XMPP_MUC_DOMAIN | default "muc.meet.jitsi" -}}
-{{ $XMPP_MUC_DOMAIN_PREFIX := (split "." $XMPP_MUC_DOMAIN)._0  -}}
-{{ $JIBRI_STRIP_DOMAIN_JID := .Env.JIBRI_STRIP_DOMAIN_JID | default $XMPP_MUC_DOMAIN_PREFIX -}}
-{{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN | default "recorder.meet.jitsi" -}}
-{{ $XMPP_TRUST_ALL_CERTS := .Env.XMPP_TRUST_ALL_CERTS | default "true" | toBool -}}
-{{ $XMPP_PORT := .Env.XMPP_PORT | default "5222" -}}
-{{ $XMPP_SERVER := .Env.XMPP_SERVER | default "xmpp.meet.jitsi" -}}
-{{ $XMPP_SERVERS := splitList "," $XMPP_SERVER -}}
 {{ $STATSD_HOST := .Env.JIBRI_STATSD_HOST | default "localhost" -}}
 {{ $STATSD_PORT := .Env.JIBRI_STATSD_PORT | default "8125" -}}
-{{/* assign env from context, preserve during range when . is re-assigned */}}
-{{ $ENV := .Env -}}
 
 jibri {
     // A unique identifier for this Jibri
@@ -45,67 +29,6 @@ jibri {
         {{ end -}}
       }
       {{ end -}}
-      xmpp {
-        // See example_xmpp_envs.conf for an example of what is expected here
-        environments = [
-{{ range $index, $element := $XMPP_SERVERS -}}
-{{ $SERVER := splitn ":" 2 $element }}
-            {
-                // A user-friendly name for this environment
-                name = "{{ $ENV.XMPP_ENV_NAME }}-{{$index}}"
-
-                // A list of XMPP server hosts to which we'll connect
-                xmpp-server-hosts = [
-                    "{{ $SERVER._0 }}"
-                ]
-
-                // The base XMPP domain
-                xmpp-domain = "{{ $XMPP_DOMAIN }}"
-
-                {{ if $ENV.PUBLIC_URL -}}
-                // An (optional) base url the Jibri will join if it is set
-                base-url = "{{ $ENV.PUBLIC_URL }}"
-                {{ end -}}
-
-                // The MUC we'll join to announce our presence for
-                // recording and streaming services
-                control-muc {
-                    domain = "{{ $XMPP_INTERNAL_MUC_DOMAIN }}"
-                    room-name = "{{ $JIBRI_BREWERY_MUC }}"
-                    nickname = "{{ $ENV.JIBRI_INSTANCE_ID }}"
-                }
-
-                // The login information for the control MUC
-                control-login {
-                    domain = "{{ $XMPP_AUTH_DOMAIN }}"
-                    port = "{{ $SERVER._1 | default $XMPP_PORT }}"
-                    username = "{{ $JIBRI_XMPP_USER }}"
-                    password = "{{ $ENV.JIBRI_XMPP_PASSWORD }}"
-                }
-
-                // The login information the selenium web client will use
-                call-login {
-                    domain = "{{ $XMPP_RECORDER_DOMAIN }}"
-                    username = "{{ $JIBRI_RECORDER_USER }}"
-                    password = "{{ $ENV.JIBRI_RECORDER_PASSWORD }}"
-                }
-
-                // The value we'll strip from the room JID domain to derive
-                // the call URL
-                strip-from-room-domain = "{{ $JIBRI_STRIP_DOMAIN_JID }}."
-
-                // How long Jibri sessions will be allowed to last before
-                // they are stopped.  A value of 0 allows them to go on
-                // indefinitely
-                usage-timeout = "{{ $JIBRI_USAGE_TIMEOUT }}"
-
-                // Whether or not we'll automatically trust any cert on
-                // this XMPP domain
-                trust-all-xmpp-certs = {{ $XMPP_TRUST_ALL_CERTS }}
-            }
-{{ end }}
-        ]
-      }
     }
     recording {
       recordings-directory = "{{ .Env.JIBRI_RECORDING_DIR | default "/config/recordings" }}"
@@ -141,15 +64,27 @@ jibri {
         "{{ join "\",\"" (splitList "," .Env.CHROMIUM_FLAGS) }}"
       ]
     }
+    {{ else if .Env.IGNORE_CERTIFICATE_ERRORS -}}
+    chrome {
+      flags = [
+        "--use-fake-ui-for-media-stream",
+        "--start-maximized",
+        "--kiosk",
+        "--enabled",
+        "--autoplay-policy=no-user-gesture-required",
+        "--ignore-certificate-errors"
+      ]
+    }
     {{ end -}}
 
-    {{ if .Env.ENABLE_STATS_D -}}
     stats {
+    {{- if .Env.ENABLE_STATS_D }}
       enable-stats-d = {{ .Env.ENABLE_STATS_D }}
       host = "{{ $STATSD_HOST }}"
       port = {{ $STATSD_PORT }}
+    {{- end }}
+      prometheus.enabled = {{ $ENABLE_PROMETHEUS }}
     }
-    {{ end -}}
 
     call-status-checks {
       {{ if .Env.NO_MEDIA_TIMEOUT -}}
@@ -178,3 +113,5 @@ jibri {
       {{ end -}}
     }
 }
+
+include "xmpp.conf"