updates for v2.3.4

This commit is contained in:
chandi 2021-06-22 00:16:00 +02:00
parent 09a47e9e72
commit 5e96b2a7d9
14 changed files with 50 additions and 28 deletions

View File

@ -1,6 +1,6 @@
# 📦 BigBlueButton 2.3 Docker # 📦 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 ## Features
- Easy installation - Easy installation

View File

@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
RUN apt-get update && apt-get install -y subversion RUN apt-get update && apt-get install -y subversion
# download bbb-common-message # 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 \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
&& rm -rf /bbb-common-message/.svn && 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 \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \
&& rm -rf /source/.svn && rm -rf /source/.svn

View File

@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
RUN apt-get update && apt-get install -y subversion RUN apt-get update && apt-get install -y subversion
# download bbb-common-message # 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 \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
&& rm -rf /bbb-common-message/.svn && rm -rf /bbb-common-message/.svn
@ -26,7 +26,7 @@ RUN cd /opt \
ENV PATH="/opt/gradle-6.7/bin:${PATH}" ENV PATH="/opt/gradle-6.7/bin:${PATH}"
# download bbb-common-web # 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 \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_WEB/bbb-common-web /bbb-common-web \
&& rm -rf /bbb-common-message/.svn && rm -rf /bbb-common-message/.svn
@ -35,7 +35,7 @@ RUN cd /bbb-common-web \
&& ./deploy.sh && ./deploy.sh
# download bbb-web # 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 \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \
&& rm -rf /bbb-web/.svn && 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 \ RUN mkdir -p /usr/share/bigbluebutton/blank \
&& cd /usr/share/bigbluebutton/blank \ && cd /usr/share/bigbluebutton/blank \
&& wget \ && wget \
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.0/bigbluebutton-config/slides/blank-svg.svg \ https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.4/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.4/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.4/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-png.png \
&& sed -i 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<policy domain="coder" rights="write" pattern="PDF" \/>/g' /etc/ImageMagick-6/policy.xml && sed -i 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<policy domain="coder" rights="write" pattern="PDF" \/>/g' /etc/ImageMagick-6/policy.xml
# get bbb-web # get bbb-web

View File

@ -35,7 +35,7 @@ RUN apt-get update && apt-get install -y \
# git sparse-checkout is not yet available with buster and there # git sparse-checkout is not yet available with buster and there
# is no other sane way of downloading a single directory via git # 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 \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-voice-conference/config/freeswitch/conf /etc/freeswitch \
&& rm -rf /etc/freeswitch/.svn && rm -rf /etc/freeswitch/.svn

View File

@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
RUN apt-get update && apt-get install -y subversion RUN apt-get update && apt-get install -y subversion
# download bbb-common-message # 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 \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
&& rm -rf /bbb-common-message/.svn && 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 \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_FSESL/bbb-fsesl-client /bbb-fsesl-client \
&& rm -rf /bbb-fsesl-client/.svn && rm -rf /bbb-fsesl-client/.svn
@ -21,7 +21,7 @@ RUN cd /bbb-fsesl-client \
&& ./deploy.sh && ./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 \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \
&& rm -rf /source/.svn && rm -rf /source/.svn

View File

@ -14,7 +14,7 @@ USER meteor
ENV METEOR_VERSION 1.10.2 ENV METEOR_VERSION 1.10.2
RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh 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 ~ \ RUN cd ~ \
&& svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \ && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
&& mv ~/bigbluebutton-html5 ~/source \ && mv ~/bigbluebutton-html5 ~/source \
@ -41,4 +41,4 @@ COPY settings.yml /app/programs/server/assets/app/config/settings.yml.tmpl
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
# lets set the tag again, so that it is include in the image for later version retrieval # 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

View File

@ -3,10 +3,20 @@ public:
mobileFontSize: 16px mobileFontSize: 16px
desktopFontSize: 14px desktopFontSize: 14px
audioChatNotification: false 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 autoJoin: true
# Disables the listen only option in audio modal.
listenOnlyMode: {{ .Env.LISTEN_ONLY_MODE }} listenOnlyMode: {{ .Env.LISTEN_ONLY_MODE }}
forceListenOnly: false forceListenOnly: false
# Skips the echo test when connecting with microphone.
skipCheck: {{ .Env.DISABLE_ECHO_TEST }} 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 skipCheckOnJoin: false
# #
# Allow users to change microphone/speaker dinamically # Allow users to change microphone/speaker dinamically
@ -20,7 +30,7 @@ public:
appName: BigBlueButton HTML5 Client appName: BigBlueButton HTML5 Client
bbbServerVersion: 2.3-dev-docker bbbServerVersion: 2.3-dev-docker
copyright: '©2021 BigBlueButton Inc.' copyright: '©2021 BigBlueButton Inc.'
html5ClientBuild: "1669-docker" html5ClientBuild: "1783-docker"
helpLink: https://bigbluebutton.org/html5/ helpLink: https://bigbluebutton.org/html5/
lockOnJoin: true lockOnJoin: true
cdn: '' 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 # in some cases we want only custom logoutUrl to be used when provided on meeting create. Default value: true
allowDefaultLogoutUrl: true allowDefaultLogoutUrl: true
allowUserLookup: false allowUserLookup: false
dynamicGuestPolicy: true
enableGuestLobbyMessage: true enableGuestLobbyMessage: true
enableNetworkInformation: false enableNetworkInformation: false
enableLimitOfViewersInWebcam: false enableLimitOfViewersInWebcam: false
@ -41,6 +52,7 @@ public:
allowLogout: true allowLogout: true
allowFullscreen: true allowFullscreen: true
preloadNextSlides: 2 preloadNextSlides: 2
warnAboutUnsavedContentOnMeetingEnd: false
mutedAlert: mutedAlert:
enabled: true enabled: true
interval: 200 interval: 200
@ -58,6 +70,15 @@ public:
# https://github.com/bigbluebutton/bigbluebutton/pull/10826 # https://github.com/bigbluebutton/bigbluebutton/pull/10826
customHeartbeat: false customHeartbeat: false
showAllAvailableLocales: true 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: defaultSettings:
application: application:
animations: true animations: true
@ -375,6 +396,7 @@ public:
enabled: {{ .Env.CHAT_ENABLED }} enabled: {{ .Env.CHAT_ENABLED }}
itemsPerPage: 100 itemsPerPage: 100
timeBetweenFetchs: 1000 timeBetweenFetchs: 1000
enableSaveAndCopyPublicChat: true
bufferChatInsertsMs: 0 bufferChatInsertsMs: 0
startClosed: {{ .Env.CHAT_START_CLOSED }} startClosed: {{ .Env.CHAT_START_CLOSED }}
min_message_length: 1 min_message_length: 1

View File

@ -9,7 +9,7 @@ storage:
enabled: true enabled: true
wiredTiger: wiredTiger:
engineConfig: engineConfig:
cacheSizeGB: 0 cacheSizeGB: 1
journalCompressor: none journalCompressor: none
directoryForIndexes: true directoryForIndexes: true
collectionConfig: collectionConfig:

View File

@ -11,12 +11,12 @@ ENV REACT_APP_BBB_PLAYBACK_BUILD=$TAG_PLAYBACK
# for the latest bbb-playback version shipped with 2.3-alpha-6 # for the latest bbb-playback version shipped with 2.3-alpha-6
# so we use the master branch # so we use the master branch
# RUN svn checkout https://github.com/bigbluebutton/bbb-playback/tags/$TAG_PLAYBACK /bbb-playback # 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 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 --from=builder /bbb-playback/build /www/playback/presentation/2.3
COPY ./bbb /etc/nginx/bbb COPY ./bbb /etc/nginx/bbb

View File

@ -45,7 +45,7 @@ RUN mkdir -p \
/usr/local/bigbluebutton/core \ /usr/local/bigbluebutton/core \
/etc/bigbluebutton /etc/bigbluebutton
ENV TAG v2.3.0 ENV TAG v2.3.4
# add bbb-record-core (lib, scripts and Gemfile) # add bbb-record-core (lib, scripts and Gemfile)
RUN cd /usr/local/bigbluebutton/core \ RUN cd /usr/local/bigbluebutton/core \

View File

@ -4,7 +4,7 @@ user=root
[program:rasque_workers] [program:rasque_workers]
command=rake resque:workers command=rake resque:workers
directory=/usr/local/bigbluebutton/core/scripts 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 user=bigbluebutton
stdout_logfile=/dev/fd/1 stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0

View File

@ -13,7 +13,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
USER webhooks 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 \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-webhooks /app \
&& rm -rf /app/.svn \ && rm -rf /app/.svn \
&& cd /app && npm install --production && cd /app && npm install --production

@ -1 +1 @@
Subproject commit 4145f8c1ad9e111bf0d3fe037e9d3be965fe1232 Subproject commit 1f82c241a6383c811c73871224e6f4670b5e45c4

View File

@ -137,14 +137,14 @@ BREAKOUTROOM_LIMIT=8
# ==================================== # ====================================
# Tuning # 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 # 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 # 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 # stretching the recommended number of users in BigBlueButton
NUMBER_OF_FRONTEND_NODEJS_PROCESSES=1 NUMBER_OF_FRONTEND_NODEJS_PROCESSES=2
# ==================================== # ====================================