Merge pull request #79 from alangecker/develop

Release v2.2.30-1

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 
 ## Unreleased
-- 
+
+## Release v2.2.30-1 (2020-12-01) #79
+- Applied v2.2.30 changes @alangecker
+- Applied v2.2.29 changes @alangecker
+- Fix bug due to unnecessary port forward #81 @trickert76 @alangecker
 
 ## Release v2.2.28-1 (2020-10-22) #67
 - Applied v2.2.28 changes @alangecker

bbb-webrtc-sfu

@@ -1 +1 @@
-Subproject commit 2b77265d05625d5df8126ced381df5ccb59160a6
+Subproject commit 0ea5bd5d14f3d96c6f5ce4b5c238fbdef82e6d87

docker-compose.prometheus.yml

@@ -2,7 +2,7 @@ version: '3.6'
 
 services:
   prometheus-exporter:
-    image: greenstatic/bigbluebutton-exporter:v0.5.2
+    image: greenstatic/bigbluebutton-exporter:v0.6.0
     restart: unless-stopped
     environment: 
       API_BASE_URL: http://10.7.7.1:8080/bigbluebutton/api/

docker-compose.yml

@@ -54,8 +54,6 @@ services:
       - etherpad
       - webrtc-sfu
       - html5
-    ports:
-      - "8080:80"
     volumes:
       - bigbluebutton:/var/bigbluebutton
       - ${DEFAULT_PRESENTATION:-/dev/null}:/etc/nginx/html/default.pdf
@@ -93,7 +91,7 @@ services:
         ipv4_address: 10.7.7.6
 
   kurento:
-    image: kurento/kurento-media-server:6.14
+    image: kurento/kurento-media-server:6.15
     restart: unless-stopped
     environment: 
       KMS_STUN_IP: ${STUN_IP}

mod/core/Dockerfile

@@ -38,7 +38,7 @@ RUN equivs-control redis-server.control \
 
 # this variable is not used, but it triggers
 # rebuilding from here on if changed
-ENV VERSION v2.2.26
+ENV VERSION v2.2.29
 
 RUN apt-get update && apt-get install -y bbb-web \
                     bbb-fsesl-akka bbb-apps-akka bbb-transcode-akka bbb-apps \

mod/html5/Dockerfile

@@ -14,7 +14,7 @@ USER meteor
 ENV METEOR_VERSION 1.8.1
 RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh
 
-ENV TAG v2.2.28
+ENV TAG v2.2.30
 RUN cd ~ \
     && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
     && mv ~/bigbluebutton-html5 ~/source \
@@ -51,4 +51,4 @@ USER meteor
 ENTRYPOINT ["/entrypoint.sh"]
 
 # lets set the tag again, so that it is include in the image for later version retrieval
-ENV TAG v2.2.28
+ENV TAG v2.2.30

mod/html5/settings.yml

@@ -11,7 +11,7 @@ public:
     appName: BigBlueButton HTML5 Client
     bbbServerVersion: 2.2
     copyright: "©2020 BigBlueButton Inc."
-    html5ClientBuild: 1058
+    html5ClientBuild: 1095
     helpLink: https://bigbluebutton.org/html5/
     lockOnJoin: true
     cdn: ""
@@ -36,6 +36,7 @@ public:
     # can generate excessive overhead to the server. We recommend
     # this value to be kept under 12.
     breakoutRoomLimit: {{ .Env.BREAKOUTROOM_LIMIT }}
+    customHeartbeat: false
     defaultSettings:
       application:
         animations: true
@@ -277,6 +278,7 @@ public:
     stunTurnServersFetchAddress: "/bigbluebutton/api/stuns"
     cacheStunTurnServers: true
     fallbackStunServer:  ''
+    recvonlyIceGatheringCheck: true
     mediaTag: "#remote-media"
     callTransferTimeout: 5000
     callHangupTimeout: 2000
@@ -284,6 +286,12 @@ public:
     echoTestNumber: 'echo'
     relayOnlyOnReconnect: false
     listenOnlyCallTimeout: 25000
+    #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
+    #user activates microphone.
+    iceGatheringTimeout: 5000
+    sipjsHackViaWs: false
   presentation:
     defaultPresentationFile: default.pdf
     panZoomThrottle: 32
@@ -412,7 +420,7 @@ public:
       - pencil
       - hand
   clientLog:
-    server: { enabled: true, level: info }
+    server: { enabled: false, level: info }
     console: { enabled: true, level: debug }
     external: { enabled: false, level: info, url: https://LOG_HOST/html5Log, method: POST, throttleInterval: 400, flushOnClose: true, logTag: "" }
 private:

mod/recordings/Dockerfile

@@ -40,7 +40,7 @@ RUN mkdir -p \
     /var/log/bigbluebutton \
     /var/log/bigbluebutton/presentation
 
-ENV TAG v2.2.27
+ENV TAG v2.2.30
 
 # add bbb-record-core (lib, scripts and Gemfile)
 RUN cd /usr/local/bigbluebutton/core \

mod/webrtc-sfu/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12-alpine
+FROM node:14-alpine
 
 RUN apk update && apk add git