Merge tag 'stable-9220-1'

release * 1e97277 jibri: update Chrome to version 121 * 310b80d jvb: add env var to control require-valid-address * b0092bc jicofo,jigasi,jvb: fix accidentally enabling Sentry * 102281e base: update tpl * bf237da etherpad: update etherpad image to etherpad/etherpad:1.9.6 (jitsi#1725) * 7381471 misc: working on unstable
matrix-org · Feb 5, 2024 · 2ecbcfc · 2ecbcfc
2 parents 82ffbff + 73ff302
commit 2ecbcfc
Show file tree

Hide file tree

Showing 32 changed files with 509 additions and 240 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,73 @@
+## stable-9220-1
+
+Based on stable release 9220-1.
+
+* 1e97277 jibri: update Chrome to version 121
+* 310b80d jvb: add env var to control require-valid-address
+* b0092bc jicofo,jigasi,jvb: fix accidentally enabling Sentry
+* 102281e base: update tpl
+* bf237da etherpad: update etherpad image to etherpad/etherpad:1.9.6 (#1725)
+* 7381471 misc: working on unstable
+
+## stable-9220
+
+Based on stable release 9220.
+
+* 4eb5575 prosody: c2s encryption flag from environment
+* cc34823 prosody: tune internal muc settings
+* f512116 prosody: jibri and jigasi skip muc passwords (#1718)
+* 6c1f384 Add flag for require-muc-config-flag. (#1717)
+* 6e6dd96 web: nginx config for load-test client if present (#1715)
+* 11d7d75 fix: Do not load domain_mapper under breakout component (#1714)
+* 4ca5763 prosody: the new version of contrib-prosody-plugins (#1713)
+* d31e164 build: simplify detection of the target platform
+* 21f04ea base: update tpl
+* 9b686c6 prosody: Drops unused module.
+* 1365d7f base-java: include jdk package
+* 4584779 jicofo: fix enable sctp octo defaults (#1708)
+* 2a3f8fd web: fix config.js syntax
+* df88c7c Fix/web settings prop syntax (#1706)
+* d64ae1c web: remove 'startBitrate' that is no longer supported.
+* 1cba0b5 web: Fix the maxbitrates config setting. Also, remove the 'enforcePreferredCodec' setting which is no longer supported.
+* 1dbe5cd web: cleanup config
+* 3a888fd jicofo: add support for max-ssrcs-per-user config
+* 5093efb feat: Add testing flag for Av1
+* 7f86006 prosody: remove muc_meeting_id from lobby
+* c21a598 prosody: visitors config whitespace fix (#1694)
+* 8845606 Move trusted_proxies from visitors to main prosody config file. (#1699)
+* e41e4f4 Require tls by default. (#1698)
+* 80e4ee6 Remove unnecessary modules and properties (#1697)
+* 2915176 prosody: skip recorder account unless in client mode
+* 46b98b5 prosody: brewery mode for jvb/jicofo discovery muc
+* 52eef2e feat: Add an option to set jibri-sip brewery jid. (#1689)
+* ab30f56 prosody: enable muc_meeting_id in lobby component
+* 5cc0ef0 jicofo: fix duplicate line
+* 2a67885 jicofo: trusted domain list
+* 78fb030 fix: Fix typo in var name. (#1690)
+* 1ad045e feat: Add an option to enable sctp for relays. (#1688)
+* aa898e4 jicofo: fix visitors auth domain (#1687)
+* ec8615a fix: Fix default JIBRI_PENDING_TIMEOUT. (#1686)
+* 483bbde web: trim deprecated options and defaults
+* 11cbfcc web: provide bosh URL as relative only if flagged (#1682)
+* 60100d6 jvb: expose public IP in autoscaler sidecar config (#1679)
+* b8a9080 task: fix shutdown script
+* 2e3c272 jvb: fix terminate script for autoscaler sidecar
+* 3519113 jvb: finish script for graceful shutdown (#1676)
+* 4fba8b5 task: support logging to file in JVB container (#1675)
+* 431cdcc web: allow desktop framerate to be automatically determined by the browser
+* 4c009ad jvb: fix version for autoscaler config
+* 4531615 prosody: add smacks to guest vhost
+* b4428bf prosody: use mod_smacks.lua from prosody since 0.12.4
+* ee2f3c9 docker-compose.yml: expose jicofo and jvb env vars for defining max memory.
+* 940cd97 env.example: add jicofo and jvb env vars for defining max memory.
+* 71b3892 jicofo,jvb,jigasi: fix SENTRY_DSN cannot be defined
+* e6a0c04 jibri: add check for /dev/shm size
+* dbffba1 Revert "jicofo, jigasi, jvb: fix SENTRY_DSN not being read"
+* 073f85d Revert "logging: fix reference to old variable"
+* 8415c84 logging: fix reference to old variable
+* fa2b4db jicofo, jigasi, jvb: fix SENTRY_DSN not being read
+* 42a2153 misc: working on unstable
+
 ## stable-9111
 
 Based on stable release 9111.

diff --git a/Makefile b/Makefile
@@ -2,20 +2,9 @@ FORCE_REBUILD ?= 0
 JITSI_RELEASE ?= stable
 JITSI_BUILD ?= unstable
 JITSI_REPO ?= jitsi
-NATIVE_ARCH ?= $(shell uname -m)
 
 JITSI_SERVICES := base base-java web prosody jicofo jvb jigasi jibri
 
-ifeq ($(NATIVE_ARCH),x86_64)
-	TARGETPLATFORM := linux/amd64
-else ifeq ($(NATIVE_ARCH),aarch64)
-	TARGETPLATFORM := linux/arm64
-else ifeq ($(NATIVE_ARCH),arm64)
-	TARGETPLATFORM := linux/arm64
-else
-	TARGETPLATFORM := unsupported
-endif
-
 BUILD_ARGS := \
 	--build-arg JITSI_REPO=$(JITSI_REPO) \
 	--build-arg JITSI_RELEASE=$(JITSI_RELEASE)
@@ -43,19 +32,12 @@ buildx:
 $(addprefix buildx_,$(JITSI_SERVICES)):
 	$(MAKE) --no-print-directory JITSI_SERVICE=$(patsubst buildx_%,%,$@) buildx
 
-ifeq ($(TARGETPLATFORM), unsupported)
 build:
-	@echo "Unsupported native architecture"
-	@exit 1
-else
-build:
-	@echo "Building for $(TARGETPLATFORM)"
 	docker build \
-		$(BUILD_ARGS) --build-arg TARGETPLATFORM=$(TARGETPLATFORM) \
+		$(BUILD_ARGS) \
 		--progress plain \
 		--tag $(JITSI_REPO)/$(JITSI_SERVICE) \
 		$(JITSI_SERVICE)
-endif
 
 $(addprefix build_,$(JITSI_SERVICES)):
 	$(MAKE) --no-print-directory JITSI_SERVICE=$(patsubst build_%,%,$@) build

diff --git a/base-java/Dockerfile b/base-java/Dockerfile
@@ -4,5 +4,5 @@ FROM ${JITSI_REPO}/base:${BASE_TAG}
 
 RUN mkdir -p /usr/share/man/man1 && \
     apt-dpkg-wrap apt-get update && \
-    apt-dpkg-wrap apt-get install -y openjdk-11-jre-headless && \
+    apt-dpkg-wrap apt-get install -y openjdk-11-jre-headless openjdk-11-jdk-headless && \
     apt-cleanup
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -1,22 +1,20 @@
 FROM docker.io/library/debian:bullseye-slim
 
 ARG JITSI_RELEASE=stable
-ARG TARGETPLATFORM
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
 COPY rootfs /
 
-RUN case ${TARGETPLATFORM} in \
-         "linux/amd64")  TPL_ARCH=amd64  ;; \
-         "linux/arm64")  TPL_ARCH=arm64  ;; \
-    esac && \
-    case ${TARGETPLATFORM} in \
-         "linux/amd64")  S6_ARCH=amd64  ;; \
-         "linux/arm64")  S6_ARCH=aarch64  ;; \
+RUN \
+    dpkgArch="$(dpkg --print-architecture)" && \
+    case "${dpkgArch##*-}" in \
+        "amd64") TPL_ARCH=amd64; S6_ARCH=amd64 ;; \
+        "arm64") TPL_ARCH=arm64; S6_ARCH=aarch64 ;; \
+        *) echo "unsupported architecture"; exit 1 ;; \
     esac && \
     apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get install -y apt-transport-https apt-utils ca-certificates gnupg wget && \
-    wget -qO /usr/bin/tpl https://github.com/jitsi/tpl/releases/download/v1.0.4/tpl-linux-${TPL_ARCH} && \
+    wget -qO /usr/bin/tpl https://github.com/jitsi/tpl/releases/download/v1.1.1/tpl-linux-${TPL_ARCH} && \
     wget -qO - https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-${S6_ARCH}.tar.gz | tar xfz - -C / && \
     wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | gpg --dearmour > /etc/apt/trusted.gpg.d/jitsi.gpg && \
     echo "deb https://download.jitsi.org $JITSI_RELEASE/" > /etc/apt/sources.list.d/jitsi.list && \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9111}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9220-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -19,21 +19,19 @@ services:
             - AUDIO_QUALITY_OPUS_BITRATE
             - AUTO_CAPTION_ON_RECORD
             - BRANDING_DATA_URL
-            - CALLSTATS_CUSTOM_SCRIPT_URL
-            - CALLSTATS_ID
-            - CALLSTATS_SECRET
+            - BOSH_RELATIVE
             - CHROME_EXTENSION_BANNER_JSON
             - COLIBRI_WEBSOCKET_PORT
             - COLIBRI_WEBSOCKET_JVB_LOOKUP_NAME
             - COLIBRI_WEBSOCKET_REGEX
             - CONFCODE_URL
-            - CONFIG_EXTERNAL_CONNECT
             - DEFAULT_LANGUAGE
             - DEPLOYMENTINFO_ENVIRONMENT
             - DEPLOYMENTINFO_ENVIRONMENT_TYPE
             - DEPLOYMENTINFO_REGION
             - DEPLOYMENTINFO_SHARD
             - DEPLOYMENTINFO_USERREGION
+            - DESKTOP_SHARING_FRAMERATE_AUTO
             - DESKTOP_SHARING_FRAMERATE_MIN
             - DESKTOP_SHARING_FRAMERATE_MAX
             - DIALIN_NUMBERS_URL
@@ -69,7 +67,6 @@ services:
             - ENABLE_HTTP_REDIRECT
             - ENABLE_IPV6
             - ENABLE_LETSENCRYPT
-            - ENABLE_LIPSYNC
             - ENABLE_NO_AUDIO_DETECTION
             - ENABLE_NOISY_MIC_DETECTION
             - ENABLE_OCTO
@@ -83,6 +80,7 @@ services:
             - ENABLE_LIVESTREAMING_HELP_LINK
             - ENABLE_LIVESTREAMING_TERMS_LINK
             - ENABLE_LIVESTREAMING_VALIDATOR_REGEXP_STRING
+            - ENABLE_LOAD_TEST_CLIENT
             - ENABLE_LOCAL_RECORDING_NOTIFY_ALL_PARTICIPANT
             - ENABLE_LOCAL_RECORDING_SELF_START
             - ENABLE_RECORDING
@@ -129,13 +127,11 @@ services:
             - RESOLUTION_WIDTH_MIN
             - START_AUDIO_MUTED
             - START_AUDIO_ONLY
-            - START_BITRATE
             - START_SILENT
             - START_WITH_AUDIO_MUTED
             - START_VIDEO_MUTED
             - START_WITH_VIDEO_MUTED
-            - TESTING_CAP_SCREENSHARE_BITRATE
-            - TESTING_OCTO_PROBABILITY
+            - TESTING_AV1_SUPPORT
             - TOKEN_AUTH_URL
             - TOOLBAR_BUTTONS
             - TRANSLATION_LANGUAGES
@@ -145,16 +141,19 @@ services:
             - VIDEOQUALITY_BITRATE_H264_LOW
             - VIDEOQUALITY_BITRATE_H264_STANDARD
             - VIDEOQUALITY_BITRATE_H264_HIGH
+            - VIDEOQUALITY_BITRATE_H264_SS_HIGH
             - VIDEOQUALITY_BITRATE_VP8_LOW
             - VIDEOQUALITY_BITRATE_VP8_STANDARD
             - VIDEOQUALITY_BITRATE_VP8_HIGH
+            - VIDEOQUALITY_BITRATE_VP8_SS_HIGH
             - VIDEOQUALITY_BITRATE_VP9_LOW
             - VIDEOQUALITY_BITRATE_VP9_STANDARD
             - VIDEOQUALITY_BITRATE_VP9_HIGH
+            - VIDEOQUALITY_BITRATE_VP9_SS_HIGH
             - VIDEOQUALITY_BITRATE_AV1_LOW
             - VIDEOQUALITY_BITRATE_AV1_STANDARD
             - VIDEOQUALITY_BITRATE_AV1_HIGH
-            - VIDEOQUALITY_ENFORCE_PREFERRED_CODEC
+            - VIDEOQUALITY_BITRATE_AV1_SS_HIGH
             - VIDEOQUALITY_PREFERRED_CODEC
             - XMPP_AUTH_DOMAIN
             - XMPP_BOSH_URL_BASE
@@ -170,7 +169,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9111}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9220-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -205,6 +204,7 @@ services:
             - GLOBAL_MODULES
             - JIBRI_RECORDER_USER
             - JIBRI_RECORDER_PASSWORD
+            - JIBRI_SIP_BREWERY_MUC
             - JIBRI_XMPP_USER
             - JIBRI_XMPP_PASSWORD
             - JICOFO_AUTH_PASSWORD
@@ -226,6 +226,7 @@ services:
             - MATRIX_UVS_ISSUER
             - MATRIX_UVS_AUTH_TOKEN
             - MATRIX_UVS_SYNC_POWER_LEVELS
+            - MATRIX_LOBBY_BYPASS
             - LOG_LEVEL
             - LDAP_AUTH_METHOD
             - LDAP_BASE
@@ -299,7 +300,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9111}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9220-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -318,6 +319,7 @@ services:
             - ENABLE_CODEC_OPUS_RED
             - ENABLE_JVB_XMPP_SERVER
             - ENABLE_OCTO
+            - ENABLE_OCTO_SCTP
             - ENABLE_RECORDING
             - ENABLE_SCTP
             - ENABLE_VISITORS
@@ -338,8 +340,10 @@ services:
             - JICOFO_ENABLE_HEALTH_CHECKS
             - JICOFO_ENABLE_REST
             - JICOFO_HEALTH_CHECKS_USE_PRESENCE
+            - JICOFO_MAX_MEMORY
             - JICOFO_MULTI_STREAM_BACKWARD_COMPAT
             - JICOFO_OCTO_REGION
+            - JICOFO_TRUSTED_DOMAINS
             - JIBRI_BREWERY_MUC
             - JIBRI_REQUEST_RETRIES
             - JIBRI_PENDING_TIMEOUT
@@ -359,6 +363,7 @@ services:
             - TZ
             - VISITORS_MAX_PARTICIPANTS
             - VISITORS_MAX_VISITORS_PER_NODE
+            - VISITORS_XMPP_AUTH_DOMAIN
             - VISITORS_XMPP_SERVER
             - VISITORS_XMPP_DOMAIN
             - XMPP_DOMAIN
@@ -369,14 +374,16 @@ services:
             - XMPP_REPLY_TIMEOUT
             - XMPP_SERVER
             - XMPP_PORT
+            - MAX_SSRCS_PER_USER
+            - MAX_SSRC_GROUPS_PER_USER
         depends_on:
             - prosody
         networks:
             meet.jitsi:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9111}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9220-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
@@ -407,9 +414,11 @@ services:
             - JVB_PORT
             - JVB_MUC_NICKNAME
             - JVB_STUN_SERVERS
+            - JVB_LOG_FILE
             - JVB_OCTO_BIND_ADDRESS
             - JVB_OCTO_REGION
             - JVB_OCTO_RELAY_ID
+            - JVB_REQUIRE_VALID_ADDRESS
             - JVB_WS_DOMAIN
             - JVB_WS_SERVER_ID
             - JVB_ENABLE_WS_COMPRESSION
@@ -424,6 +433,7 @@ services:
             - COLIBRI_REST_ENABLED
             - SHUTDOWN_REST_ENABLED
             - TZ
+            - VIDEOBRIDGE_MAX_MEMORY
             - XMPP_AUTH_DOMAIN
             - XMPP_INTERNAL_MUC_DOMAIN
             - XMPP_SERVER

diff --git a/env.example b/env.example
@@ -36,6 +36,12 @@ TZ=UTC
 # https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-docker#running-behind-nat-or-on-a-lan-environment
 #JVB_ADVERTISE_IPS=192.168.1.1,1.2.3.4
 
+#
+# Memory limits for Java components
+#
+
+#JICOFO_MAX_MEMORY=3072m
+#VIDEOBRIDGE_MAX_MEMORY=3072m
 
 #
 # JaaS Components (beta)

diff --git a/etherpad.yml b/etherpad.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # Etherpad: real-time collaborative document editing
     etherpad:
-        image: etherpad/etherpad:1.8.6
+        image: etherpad/etherpad:1.9.6
         restart: ${RESTART_POLICY:-unless-stopped}
         environment:
             - TITLE=${ETHERPAD_TITLE}

diff --git a/jibri.yml b/jibri.yml
@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     jibri:
-        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-9111}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-9220-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z

diff --git a/jibri/Dockerfile b/jibri/Dockerfile
@@ -8,18 +8,25 @@ LABEL org.opencontainers.image.url="https://github.com/jitsi/jibri"
 LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-meet"
 LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 
-ARG TARGETPLATFORM
 ARG USE_CHROMIUM=0
 #ARG CHROME_RELEASE=latest
 # https://googlechromelabs.github.io/chrome-for-testing/
-ARG CHROME_RELEASE=116.0.5845.96
+ARG CHROME_RELEASE=121.0.6167.85
 
 COPY rootfs/ /
 
 RUN apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" jibri libgl1-mesa-dri procps jitsi-upload-integrations jitsi-autoscaler-sidecar jq pulseaudio dbus dbus-x11 rtkit unzip fonts-noto && \
     /usr/bin/install-chrome.sh && \
     apt-cleanup && \
-    adduser jibri rtkit
+    adduser jibri rtkit && \
+    dpkgArch="$(dpkg --print-architecture)" && \
+    case "${dpkgArch##*-}" in \
+        "amd64") SC_ARCH=x86_64 ;; \
+        "arm64") SC_ARCH=aarch64 ;; \
+        *) echo "unsupported architecture"; exit 1 ;; \
+    esac && \
+    wget -qO /usr/bin/shm-check https://github.com/saghul/shm-check/releases/download/v1.0.0/shm-check-${SC_ARCH} && \
+    chmod +x /usr/bin/shm-check
 
 VOLUME /config