From 5e96b2a7d94afe102247b1ec059854d2f5a9ca43 Mon Sep 17 00:00:00 2001 From: chandi Date: Tue, 22 Jun 2021 00:16:00 +0200 Subject: [PATCH] updates for v2.3.4 --- README.md | 2 +- mod/apps-akka/Dockerfile | 4 ++-- mod/bbb-web/Dockerfile | 14 +++++++------- mod/freeswitch/Dockerfile | 2 +- mod/fsesl-akka/Dockerfile | 6 +++--- mod/html5/Dockerfile | 4 ++-- mod/html5/settings.yml | 24 +++++++++++++++++++++++- mod/mongo/mongod.conf | 2 +- mod/nginx/Dockerfile | 4 ++-- mod/recordings/Dockerfile | 2 +- mod/recordings/supervisord.conf | 2 +- mod/webhooks/Dockerfile | 2 +- mod/webrtc-sfu/bbb-webrtc-sfu | 2 +- sample.env | 8 ++++---- 14 files changed, 50 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index afb6e0f..33cdb95 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 📦 BigBlueButton 2.3 Docker -Version: 2.3.0 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues) +Version: 2.3.4 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues) ## Features - Easy installation diff --git a/mod/apps-akka/Dockerfile b/mod/apps-akka/Dockerfile index c76acb7..1d7c2d6 100644 --- a/mod/apps-akka/Dockerfile +++ b/mod/apps-akka/Dockerfile @@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder RUN apt-get update && apt-get install -y subversion # download bbb-common-message -ENV TAG_COMMON_MESSAGE v2.3.0 +ENV TAG_COMMON_MESSAGE v2.3.4 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \ && rm -rf /bbb-common-message/.svn @@ -14,7 +14,7 @@ RUN cd /bbb-common-message \ # =================================================== -ENV TAG v2.3.0 +ENV TAG v2.3.4 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \ && rm -rf /source/.svn diff --git a/mod/bbb-web/Dockerfile b/mod/bbb-web/Dockerfile index 3dbed29..33a22bd 100644 --- a/mod/bbb-web/Dockerfile +++ b/mod/bbb-web/Dockerfile @@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder RUN apt-get update && apt-get install -y subversion # download bbb-common-message -ENV TAG_COMMON_MESSAGE v2.3.0 +ENV TAG_COMMON_MESSAGE v2.3.4 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \ && rm -rf /bbb-common-message/.svn @@ -26,7 +26,7 @@ RUN cd /opt \ ENV PATH="/opt/gradle-6.7/bin:${PATH}" # download bbb-common-web -ENV TAG_COMMON_WEB v2.3.0 +ENV TAG_COMMON_WEB v2.3.4 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_WEB/bbb-common-web /bbb-common-web \ && rm -rf /bbb-common-message/.svn @@ -35,7 +35,7 @@ RUN cd /bbb-common-web \ && ./deploy.sh # download bbb-web -ENV TAG_WEB v2.3.0 +ENV TAG_WEB v2.3.4 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \ && rm -rf /bbb-web/.svn @@ -77,10 +77,10 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI RUN mkdir -p /usr/share/bigbluebutton/blank \ && cd /usr/share/bigbluebutton/blank \ && wget \ - https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.0/bigbluebutton-config/slides/blank-svg.svg \ - https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.0/bigbluebutton-config/slides/blank-thumb.png \ - https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.0/bigbluebutton-config/slides/blank-presentation.pdf \ - https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.0/bigbluebutton-config/slides/blank-png.png \ + https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.4/bigbluebutton-config/slides/blank-svg.svg \ + https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.4/bigbluebutton-config/slides/blank-thumb.png \ + https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.4/bigbluebutton-config/slides/blank-presentation.pdf \ + https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.4/bigbluebutton-config/slides/blank-png.png \ && sed -i 's///g' /etc/ImageMagick-6/policy.xml # get bbb-web diff --git a/mod/freeswitch/Dockerfile b/mod/freeswitch/Dockerfile index fd7c1a1..2cb4d30 100644 --- a/mod/freeswitch/Dockerfile +++ b/mod/freeswitch/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update && apt-get install -y \ # git sparse-checkout is not yet available with buster and there # is no other sane way of downloading a single directory via git -ENV TAG v2.3.0 +ENV TAG v2.3.4 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-voice-conference/config/freeswitch/conf /etc/freeswitch \ && rm -rf /etc/freeswitch/.svn diff --git a/mod/fsesl-akka/Dockerfile b/mod/fsesl-akka/Dockerfile index 8821fe9..726d7ea 100644 --- a/mod/fsesl-akka/Dockerfile +++ b/mod/fsesl-akka/Dockerfile @@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder RUN apt-get update && apt-get install -y subversion # download bbb-common-message -ENV TAG_COMMON_MESSAGE v2.3.0 +ENV TAG_COMMON_MESSAGE v2.3.4 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \ && rm -rf /bbb-common-message/.svn @@ -13,7 +13,7 @@ RUN cd /bbb-common-message \ # =================================================== -ENV TAG_FSESL v2.3.0 +ENV TAG_FSESL v2.3.4 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_FSESL/bbb-fsesl-client /bbb-fsesl-client \ && rm -rf /bbb-fsesl-client/.svn @@ -21,7 +21,7 @@ RUN cd /bbb-fsesl-client \ && ./deploy.sh -ENV TAG v2.3.0 +ENV TAG v2.3.4 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \ && rm -rf /source/.svn diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile index 2b9fc5a..9189355 100644 --- a/mod/html5/Dockerfile +++ b/mod/html5/Dockerfile @@ -14,7 +14,7 @@ USER meteor ENV METEOR_VERSION 1.10.2 RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh -ENV TAG v2.3.0 +ENV TAG v2.3.4 RUN cd ~ \ && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \ && mv ~/bigbluebutton-html5 ~/source \ @@ -41,4 +41,4 @@ COPY settings.yml /app/programs/server/assets/app/config/settings.yml.tmpl ENTRYPOINT ["/entrypoint.sh"] # lets set the tag again, so that it is include in the image for later version retrieval -ENV TAG v2.3.0 +ENV TAG v2.3.4 diff --git a/mod/html5/settings.yml b/mod/html5/settings.yml index 1ffcc62..0831649 100644 --- a/mod/html5/settings.yml +++ b/mod/html5/settings.yml @@ -3,10 +3,20 @@ public: mobileFontSize: 16px desktopFontSize: 14px audioChatNotification: false + # Shows the audio modal when user joins the room. The audio modal prompts + # user to select an option ("Microphone" and/or "Listen only") for joining + # audio autoJoin: true + # Disables the listen only option in audio modal. listenOnlyMode: {{ .Env.LISTEN_ONLY_MODE }} forceListenOnly: false + # Skips the echo test when connecting with microphone. skipCheck: {{ .Env.DISABLE_ECHO_TEST }} + # Skips the echo test when connecting with microphone right after user + # joins the room the first time. Subsequents joins to microphone won't + # have echo test skipped, for example if user leave and join mic again + # or reloading page and joining mic again. + # This setting won't have effect if skipCheck = true skipCheckOnJoin: false # # Allow users to change microphone/speaker dinamically @@ -20,7 +30,7 @@ public: appName: BigBlueButton HTML5 Client bbbServerVersion: 2.3-dev-docker copyright: '©2021 BigBlueButton Inc.' - html5ClientBuild: "1669-docker" + html5ClientBuild: "1783-docker" helpLink: https://bigbluebutton.org/html5/ lockOnJoin: true cdn: '' @@ -30,6 +40,7 @@ public: # in some cases we want only custom logoutUrl to be used when provided on meeting create. Default value: true allowDefaultLogoutUrl: true allowUserLookup: false + dynamicGuestPolicy: true enableGuestLobbyMessage: true enableNetworkInformation: false enableLimitOfViewersInWebcam: false @@ -41,6 +52,7 @@ public: allowLogout: true allowFullscreen: true preloadNextSlides: 2 + warnAboutUnsavedContentOnMeetingEnd: false mutedAlert: enabled: true interval: 200 @@ -58,6 +70,15 @@ public: # https://github.com/bigbluebutton/bigbluebutton/pull/10826 customHeartbeat: false showAllAvailableLocales: true + # Show "Audio Filters for Microphone" option in settings menu. + # When set to true, users are able to enable/disable microphone constraints, + # otherwise default values for 'microphoneConstraints' option + # are used. + # For more info, see 'microphoneConstraints' option in this config. + # If not set, default value is true. + showAudioFilters: true + raiseHandActionButton: + enabled: true defaultSettings: application: animations: true @@ -375,6 +396,7 @@ public: enabled: {{ .Env.CHAT_ENABLED }} itemsPerPage: 100 timeBetweenFetchs: 1000 + enableSaveAndCopyPublicChat: true bufferChatInsertsMs: 0 startClosed: {{ .Env.CHAT_START_CLOSED }} min_message_length: 1 diff --git a/mod/mongo/mongod.conf b/mod/mongo/mongod.conf index 7eac8bf..bce6bd9 100644 --- a/mod/mongo/mongod.conf +++ b/mod/mongo/mongod.conf @@ -9,7 +9,7 @@ storage: enabled: true wiredTiger: engineConfig: - cacheSizeGB: 0 + cacheSizeGB: 1 journalCompressor: none directoryForIndexes: true collectionConfig: diff --git a/mod/nginx/Dockerfile b/mod/nginx/Dockerfile index b7049d1..f0ba87b 100644 --- a/mod/nginx/Dockerfile +++ b/mod/nginx/Dockerfile @@ -11,12 +11,12 @@ ENV REACT_APP_BBB_PLAYBACK_BUILD=$TAG_PLAYBACK # for the latest bbb-playback version shipped with 2.3-alpha-6 # so we use the master branch # RUN svn checkout https://github.com/bigbluebutton/bbb-playback/tags/$TAG_PLAYBACK /bbb-playback -RUN git clone https://github.com/bigbluebutton/bbb-playback.git /bbb-playback && cd /bbb-playback && git checkout a9d3b7b6648fb5e85e012e73d7e7a2684d02f215 +RUN git clone https://github.com/bigbluebutton/bbb-playback.git /bbb-playback && cd /bbb-playback && git checkout 5934114aa434aba9b73b1a4c2ce228d18f276610 RUN cd /bbb-playback && npm install && npm run-script build # -------------------- -FROM nginx:1.19-alpine +FROM nginx:1.21-alpine COPY --from=builder /bbb-playback/build /www/playback/presentation/2.3 COPY ./bbb /etc/nginx/bbb diff --git a/mod/recordings/Dockerfile b/mod/recordings/Dockerfile index 3eb6d6e..992fe79 100644 --- a/mod/recordings/Dockerfile +++ b/mod/recordings/Dockerfile @@ -45,7 +45,7 @@ RUN mkdir -p \ /usr/local/bigbluebutton/core \ /etc/bigbluebutton -ENV TAG v2.3.0 +ENV TAG v2.3.4 # add bbb-record-core (lib, scripts and Gemfile) RUN cd /usr/local/bigbluebutton/core \ diff --git a/mod/recordings/supervisord.conf b/mod/recordings/supervisord.conf index 36b3650..aa71b41 100644 --- a/mod/recordings/supervisord.conf +++ b/mod/recordings/supervisord.conf @@ -4,7 +4,7 @@ user=root [program:rasque_workers] command=rake resque:workers directory=/usr/local/bigbluebutton/core/scripts -environment=QUEUE="rap:archive,rap:publish,rap:process,rap:sanity,rap:captions",COUNT="1",VVERBOSE="1" +environment=QUEUE="rap:archive,rap:publish,rap:process,rap:sanity,rap:captions,rap:events",COUNT="1",VVERBOSE="1" user=bigbluebutton stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 diff --git a/mod/webhooks/Dockerfile b/mod/webhooks/Dockerfile index 0778b04..2992d07 100644 --- a/mod/webhooks/Dockerfile +++ b/mod/webhooks/Dockerfile @@ -13,7 +13,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI USER webhooks -ENV TAG v2.3.0 +ENV TAG v2.3.4 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-webhooks /app \ && rm -rf /app/.svn \ && cd /app && npm install --production diff --git a/mod/webrtc-sfu/bbb-webrtc-sfu b/mod/webrtc-sfu/bbb-webrtc-sfu index 4145f8c..1f82c24 160000 --- a/mod/webrtc-sfu/bbb-webrtc-sfu +++ b/mod/webrtc-sfu/bbb-webrtc-sfu @@ -1 +1 @@ -Subproject commit 4145f8c1ad9e111bf0d3fe037e9d3be965fe1232 +Subproject commit 1f82c241a6383c811c73871224e6f4670b5e45c4 diff --git a/sample.env b/sample.env index 6d3c328..28b09dc 100644 --- a/sample.env +++ b/sample.env @@ -137,14 +137,14 @@ BREAKOUTROOM_LIMIT=8 # ==================================== # Tuning # ==================================== -# Default = 1; Min = 1; Max = 4 +# Default = 2; Min = 1; Max = 4 # On powerful systems with high number of meetings you can set values up to 4 to accelerate handling of events -NUMBER_OF_BACKEND_NODEJS_PROCESSES=1 +NUMBER_OF_BACKEND_NODEJS_PROCESSES=2 -# Default = 1; Min = 1; Max = 8 +# Default = 2; Min = 1; Max = 8 # Set a number between 1 and 4 times the value of NUMBER_OF_BACKEND_NODEJS_PROCESSES where higher number helps with meetings # stretching the recommended number of users in BigBlueButton -NUMBER_OF_FRONTEND_NODEJS_PROCESSES=1 +NUMBER_OF_FRONTEND_NODEJS_PROCESSES=2 # ====================================