v2.4-rc-1: node v14, learning dashboard, base images update

docker-compose.tmpl.yml

@@ -56,6 +56,7 @@ services:
       STUN_SERVER: stun:${STUN_IP}:${STUN_PORT}
       TURN_SERVER: ${TURN_SERVER:-}
       TURN_SECRET: ${TURN_SECRET:-}
+      ENABLE_LEARNING_DASHBOARD: ${ENABLE_LEARNING_DASHBOARD:-true}
       NUMBER_OF_BACKEND_NODEJS_PROCESSES: {{ .Env.NUMBER_OF_BACKEND_NODEJS_PROCESSES }}
     volumes:
       - bigbluebutton:/var/bigbluebutton

mod/apps-akka/Dockerfile

@@ -1,9 +1,9 @@
-FROM mozilla/sbt:8u181_1.2.7 AS builder
+FROM mozilla/sbt:8u212_1.2.8 AS builder
 
 RUN apt-get update && apt-get install -y subversion
 
 # download bbb-common-message
-ENV TAG_COMMON_MESSAGE v2.3.14
+ENV TAG_COMMON_MESSAGE v2.4-rc-1
 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.14
+ENV TAG v2.4-rc-1
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \
     && rm -rf /source/.svn
 
@@ -31,7 +31,7 @@ RUN apt update && apt-get install -y wget gosu
 
 # install dockerize
 ENV DOCKERIZE_VERSION v0.6.1
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 

mod/bbb-web/Dockerfile

@@ -1,9 +1,9 @@
-FROM mozilla/sbt:8u181_1.2.7 AS builder
+FROM mozilla/sbt:8u212_1.2.8 AS builder
 
 RUN apt-get update && apt-get install -y subversion
 
 # download bbb-common-message
-ENV TAG_COMMON_MESSAGE v2.3.14
+ENV TAG_COMMON_MESSAGE v2.4-rc-1
 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.14
+ENV TAG_COMMON_WEB v2.4-rc-1
 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.14
+ENV TAG_WEB v2.4-rc-1
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \
     && rm -rf /bbb-web/.svn
 
@@ -68,7 +68,7 @@ RUN groupadd -g 998 bigbluebutton && useradd -m -u 998 -g bigbluebutton bigblueb
 
 # add dockerize
 ENV DOCKERIZE_VERSION v0.6.1
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 

mod/bbb-web/bbb-web.properties

@@ -18,3 +18,5 @@ beans.presentationService.defaultUploadedPresentation=https://test.bigbluebutton
 {{else}}
 beans.presentationService.defaultUploadedPresentation=${bigbluebutton.web.serverURL}/default.pdf
 {{end}}
+
+learningDashboardEnabled={{ .Env.ENABLE_LEARNING_DASHBOARD }}

mod/etherpad/Dockerfile

@@ -1,4 +1,4 @@
-FROM etherpad/etherpad:1.8.13
+FROM etherpad/etherpad:1.8.14
 
 USER root
 
@@ -9,7 +9,7 @@ USER etherpad
 
 # only used to trigger a fresh run of the npm install
 # command without caching
-ENV TAG v2.3.0
+ENV TAG v2.4-rc-1
 
 RUN npm install  \
     git+https://git@github.com/pedrobmarin/ep_pad_ttl.git \

mod/freeswitch/Dockerfile

@@ -8,7 +8,7 @@ echo 'deb http://files.freeswitch.org/repo/deb/debian-release/ buster main' > /e
 
 # install dockerize
 ENV DOCKERIZE_VERSION v0.6.1
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 

mod/fsesl-akka/Dockerfile

@@ -1,9 +1,9 @@
-FROM mozilla/sbt:8u181_1.2.7 AS builder
+FROM mozilla/sbt:8u212_1.2.8 AS builder
 
 RUN apt-get update && apt-get install -y subversion
 
 # download bbb-common-message
-ENV TAG_COMMON_MESSAGE v2.3.14
+ENV TAG_COMMON_MESSAGE v2.4-rc-1
 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.14
+ENV TAG_FSESL v2.4-rc-1
 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.14
+ENV TAG v2.4-rc-1
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \
     && rm -rf /source/.svn
 
@@ -38,7 +38,7 @@ RUN apt update && apt-get install -y wget gosu
 
 # install dockerize
 ENV DOCKERIZE_VERSION v0.6.1
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 

mod/html5/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12-buster-slim AS builder
+FROM node:14-buster-slim AS builder
 
 RUN apt-get update && apt-get install -y wget curl subversion python3 build-essential
 RUN groupadd -g 2000 meteor && useradd -m -u 2001 -g meteor meteor
@@ -6,15 +6,15 @@ RUN groupadd -g 2000 meteor && useradd -m -u 2001 -g meteor meteor
 
 # download dockerize
 ENV DOCKERIZE_VERSION v0.6.1
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
 USER meteor
-ENV METEOR_VERSION 1.10.2
+ENV METEOR_VERSION 2.3.6
 RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh
 
-ENV TAG v2.3.14
+ENV TAG v2.4-rc-1
 RUN cd ~ \
     && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
     && mv ~/bigbluebutton-html5 ~/source \
@@ -29,7 +29,7 @@ RUN cd ~/app/bundle/programs/server \
     
 # ------------------------------
 
-FROM node:12-alpine
+FROM node:14-alpine
 
 RUN addgroup -g 2000 meteor && \
     adduser -D -u 2001 -G meteor meteor && \
@@ -42,4 +42,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.14
+ENV TAG v2.4-rc-1

mod/html5/settings.yml

@@ -13,13 +13,13 @@ public:
     # 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
+    # joins the room the first time. Subsequent joins to microphone won't
-    # have echo test skipped, for example if user leave and join mic again
+    # have echo test skipped, for example if user leaves and joins the mic
-    # or reloading page and joining mic again.
+    # 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
+    # Allow users to change microphone/speaker dynamically
     # The device is changed immediately, without the need to rejoin
     # audio. Default value is true
     # Firefox users: if no output devices is shown, you may set the flag
@@ -28,9 +28,9 @@ public:
     #
     clientTitle: {{ .Env.CLIENT_TITLE }}
     appName: BigBlueButton HTML5 Client
-    bbbServerVersion: 2.3-docker
+    bbbServerVersion: "2.4-docker"
     copyright: '©2021 BigBlueButton Inc.'
-    html5ClientBuild: "1845-docker"
+    html5ClientBuild: "2277-docker"
     helpLink: https://bigbluebutton.org/html5/
     lockOnJoin: true
     cdn: ''
@@ -44,7 +44,6 @@ public:
     allowUserLookup: false
     dynamicGuestPolicy: true
     enableGuestLobbyMessage: true
-    enableNetworkInformation: false
     enableLimitOfViewersInWebcam: false
     enableMultipleCameras: true
     enableTalkingIndicator: true
@@ -93,9 +92,9 @@ public:
     #
     # Shows stats about download and upload rates, audio jitter, lost packets
     # and turn information
-    enableNetworkStats: false
+    enableNetworkStats: true
     # Enable the button to allow users to copy network stats to clipboard
-    enableCopyNetworkStatsButton: false
+    enableCopyNetworkStatsButton: true
     defaultSettings:
       application:
         animations: true
@@ -103,11 +102,14 @@ public:
         chatPushAlerts: false
         userJoinAudioAlerts: false
         userJoinPushAlerts: false
+        userLeaveAudioAlerts: false
+        userLeavePushAlerts: false
         raiseHandAudioAlerts: true
         raiseHandPushAlerts: true
         guestWaitingAudioAlerts: true
         guestWaitingPushAlerts: true
         paginationEnabled: true
+        pushLayoutToEveryone: false
         # fallbackLocale: if the locale the client is loaded in does not have a
         # translation a string, it will use the translation from the locale
         # specified in fallbackLocale. Note that fallbackLocale should be a
@@ -188,9 +190,6 @@ public:
       - warning
   externalVideoPlayer:
     enabled: true
-  networkMonitoring:
-    enableNetworkMonitoring: false
-    packetLostThreshold: 10
   kurento:
     wsUrl: wss://{{ .Env.DOMAIN }}/bbb-webrtc-sfu
     # Valid for video-provider. Time (ms) before its WS connection times out
@@ -206,6 +205,14 @@ public:
       # subscribe reattempt increases the reconnection timer up to this
       maxTimeout: 60000
     screenshare:
+      # Experimental. True is the canonical behavior. Flip to false to reverse
+      # the negotiation flow for subscribers.
+      subscriberOffering: true
+      # Experimental. Server wide configuration to choose which bbb-webrtc-sfu
+      # media server adapter should be used for screen sharing.
+      # Default is undefined, which means the default setting in bbb-webrtc-sfu
+      # prevails (screenshareMediaServer).
+      #mediaServer: Kurento
       bitrate: 1500
       mediaTimeouts:
         maxConnectionAttempts: 2
@@ -305,6 +312,16 @@ public:
     enableVideo: true
     enableVideoMenu: true
     enableListenOnly: true
+    # Experimental. Server wide configuration to choose which bbb-webrtc-sfu
+    # media server adapter should be used for listen only.
+    # Default is undefined, which means the default setting in bbb-webrtc-sfu
+    # prevails (listenOnlyMediaServer).
+    #listenOnlyMediaServer: Kurento
+    # Experimental. Server wide configuration to choose which bbb-webrtc-sfu
+    # media server adapter should be used for webcams.
+    # Default is undefined, which means the default setting in bbb-webrtc-sfu
+    # prevails (videoMediaServer).
+    #videoMediaServer: Kurento
     autoShareWebcam: {{ .Env.AUTO_SHARE_WEBCAM }}
     skipVideoPreview: {{ .Env.DISABLE_VIDEO_PREVIEW }}
     skipVideoPreviewOnFirstJoin: false
@@ -399,6 +416,7 @@ public:
     maxCustom: 5
     allowDragAndDropFile: false
     maxTypedAnswerLength: 45
+    chatMessage: true
   captions:
     enabled: true
     enableDictation: false
@@ -434,6 +452,7 @@ public:
       chat_poll_result: PUBLIC_CHAT_POLL_RESULT
     typingIndicator:
       enabled: true
+    moderatorChatEmphasized: true
   note:
     enabled: true
     url: https://{{ .Env.DOMAIN }}/pad
@@ -452,6 +471,9 @@ public:
     echoTestNumber: 'echo'
     relayOnlyOnReconnect: false
     listenOnlyCallTimeout: 25000
+    # Experimental. True is the canonical behavior. Flip to false to reverse
+    # the negotiation flow for LO subscribers.
+    listenOnlyOffering: true
     #Timeout (ms) for gathering ICE candidates. When this timeout expires
     #the SDP is sent to the server with the candidates the browser gathered
     #so far. Increasing this value might help avoiding 1004 error when
@@ -499,7 +521,6 @@ public:
     help: STATS_HELP_URL
   presentation:
     allowDownloadable: true
-    defaultPresentationFile: default.pdf
     panZoomThrottle: 32
     restoreOnUpdate: false
     uploadEndpoint: '/bigbluebutton/presentation/upload'
@@ -550,6 +571,7 @@ public:
       moderator: false
       mobile: true
       guest: true
+      sharingWebcam: true
   whiteboard:
     annotationsQueueProcessInterval: 60
     cursorInterval: 150
@@ -646,6 +668,16 @@ public:
       throttleInterval: 400
       flushOnClose: true
       logTag: ''
+  virtualBackgrounds:
+    enabled: true
+    storedOnBBB: true
+    showThumbnails: true
+    imagesPath: /resources/images/virtual-backgrounds/
+    thumbnailsPath: /resources/images/virtual-backgrounds/thumbnails/
+    fileNames:
+      - home.jpg
+      - coffeeshop.jpg
+      - board.jpg
 private:
   analytics:
     includeChat: true
@@ -711,4 +743,3 @@ private:
       version: 10
     - browser: YandexBrowser
       version: 19
-      

mod/nginx/Dockerfile

@@ -4,20 +4,20 @@ RUN apk add subversion git
 
 # --------------------
 
+ENV TAG_LEARNING_DASHBOARD v2.4-rc-1
+RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_LEARNING_DASHBOARD/bbb-learning-dashboard /bbb-learning-dashboard && rm -r /bbb-learning-dashboard/.svn
+RUN cd /bbb-learning-dashboard && npm ci && npm run build
+
 ENV TAG_PLAYBACK v3.1.0
 ENV REACT_APP_BBB_PLAYBACK_BUILD=$TAG_PLAYBACK
-
+RUN svn checkout https://github.com/bigbluebutton/bbb-playback/tags/$TAG_PLAYBACK /bbb-playback && rm -r /bbb-playback/.svn
-# apparently there is currently no github release & tag created
+RUN cd /bbb-playback && npm ci && npm run build
-# 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 5934114aa434aba9b73b1a4c2ce228d18f276610
-RUN cd /bbb-playback && npm install && npm run-script build
 
 # --------------------
 
 FROM nginx:1.21-alpine
 
+COPY --from=builder /bbb-learning-dashboard/build /www/learning-dashboard
 COPY --from=builder /bbb-playback/build /www/playback/presentation/2.3
 COPY ./bbb /etc/nginx/bbb
 COPY ./bigbluebutton /etc/nginx/conf.d/default.conf

mod/nginx/bbb/learning-dashboard.nginx

@@ -0,0 +1,9 @@
+location ~ /learning-dashboard/([0-9a-f]+-[0-9]+)/(.*) {
+    root /var/bigbluebutton/learning-dashboard/;
+    autoindex off;
+}
+
+location /learning-dashboard/ {
+    alias /www/learning-dashboard/;
+    autoindex off;
+}

mod/recordings/Dockerfile

@@ -36,7 +36,7 @@ RUN cd /tmp \
 
 # add dockerize
 ENV DOCKERIZE_VERSION v0.6.1
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
@@ -45,7 +45,7 @@ RUN mkdir -p \
     /usr/local/bigbluebutton/core \
     /etc/bigbluebutton
 
-ENV TAG v2.3.14
+ENV TAG v2.4-rc-1
 
 # add bbb-record-core (lib, scripts and Gemfile)
 RUN cd /usr/local/bigbluebutton/core \

mod/webhooks/Dockerfile

@@ -1,8 +1,8 @@
-FROM node:12-alpine
+FROM node:14-alpine
 
 # download dockerize
 ENV DOCKERIZE_VERSION v0.6.1
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && apk add subversion \
@@ -13,7 +13,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
 USER webhooks
 
 
-ENV TAG v2.3.4
+ENV TAG v2.4-rc-1
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-webhooks /app \
     && rm -rf /app/.svn \
     && cd /app && npm install --production

mod/webrtc-sfu/bbb-webrtc-sfu

@@ -1 +1 @@
-Subproject commit 4f10ca89ee638d78fee364e3932f80ed5cc7496b
+Subproject commit e7c88d652e9af13cbc668c924a4a0ce867f907fb

sample.env

@@ -144,6 +144,9 @@ DISABLE_SOUND_ALONE=false
 # this value to be kept under 12.
 BREAKOUTROOM_LIMIT=8
 
+# set to false to disable the learning dashboard
+ENABLE_LEARNING_DASHBOARD=true
+
 # ====================================
 # Tuning
 # ====================================

scripts/upgrade

@@ -26,7 +26,7 @@ else
 
     echo ""
     echo "# pull newest images"
-    docker-compose pull
+    docker-compose pull --ignore-pull-failures
 
     echo ""
     echo "# rebuild images"