Merge pull request #60 from alangecker/develop

Release v2.2.26-1
This commit is contained in:
chandi 2020-09-30 09:35:10 +02:00 committed by GitHub
commit 3117deab11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 31 additions and 13 deletions

@ -1 +1 @@
Subproject commit 8dfb34d808b4648873340877904500629ba55dc6 Subproject commit 2a6343f6ccdf16edaf50a73b776bf54ccad39b23

View File

@ -102,6 +102,7 @@ services:
KMS_MAX_PORT: 32768 KMS_MAX_PORT: 32768
KMS_TURN_URL: KMS_TURN_URL:
KMS_NETWORK_INTERFACES: ${NETWORK_INTERFACE:-} KMS_NETWORK_INTERFACES: ${NETWORK_INTERFACE:-}
GST_DEBUG: 3,Kurento*:4,kms*:4,KurentoWebSocketTransport:5
network_mode: host network_mode: host
volumes: volumes:
- vol-kurento:/var/kurento - vol-kurento:/var/kurento

View File

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

View File

@ -355,3 +355,8 @@ lockSettingsLockOnJoinConfigurable=false
allowDuplicateExtUserid=true allowDuplicateExtUserid=true
defaultTextTrackUrl=${bigbluebutton.web.serverURL}/bigbluebutton defaultTextTrackUrl=${bigbluebutton.web.serverURL}/bigbluebutton
# Param to end the meeting when there are no moderators after a certain period of time.
# Needed for classes where teacher gets disconnected and can't get back in. Prevents
# students from running amok.
endWhenNoModerator=false

View File

@ -14,7 +14,7 @@ USER meteor
ENV METEOR_VERSION 1.8.1 ENV METEOR_VERSION 1.8.1
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.2.23 ENV TAG v2.2.26
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 \
@ -51,4 +51,4 @@ USER meteor
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.2.23 ENV TAG v2.2.24

View File

@ -11,7 +11,7 @@ public:
appName: BigBlueButton HTML5 Client appName: BigBlueButton HTML5 Client
bbbServerVersion: 2.2 bbbServerVersion: 2.2
copyright: "©2020 BigBlueButton Inc." copyright: "©2020 BigBlueButton Inc."
html5ClientBuild: 1006 html5ClientBuild: 1032
helpLink: https://bigbluebutton.org/html5/ helpLink: https://bigbluebutton.org/html5/
lockOnJoin: true lockOnJoin: true
cdn: "" cdn: ""
@ -29,6 +29,10 @@ public:
allowFullscreen: true allowFullscreen: true
remainingTimeThreshold: 30 remainingTimeThreshold: 30
remainingTimeAlertThreshold: 1 remainingTimeAlertThreshold: 1
# Warning: increasing the limit of breakout rooms per meeting
# can generate excessive overhead to the server. We recommend
# this value to be kept under 12.
breakoutRoomLimit: 8
defaultSettings: defaultSettings:
application: application:
animations: true animations: true
@ -451,22 +455,24 @@ private:
enabled: false enabled: false
minBrowserVersions: minBrowserVersions:
- browser: chrome - browser: chrome
version: 59 version: 72
- browser: chromeMobileIOS - browser: chromeMobileIOS
version: Infinity version: Infinity
- browser: firefox - browser: firefox
version: 52 version: 63
- browser: firefoxMobile - browser: firefoxMobile
version: 52 version: 68
- browser: edge - browser: edge
version: 17 version: 79
- browser: ie - browser: ie
version: Infinity version: Infinity
- browser: safari - browser: safari
version: [11, 1] version: [12, 1]
- browser: mobileSafari - browser: mobileSafari
version: [11, 1] version: [12, 1]
- browser: opera - browser: opera
version: 46 version: 50
- browser: electron - browser: electron
version: [0, 36] version: [0, 36]
- browser: YandexBrowser
version: 19

View File

@ -40,7 +40,7 @@ RUN mkdir -p \
/var/log/bigbluebutton \ /var/log/bigbluebutton \
/var/log/bigbluebutton/presentation /var/log/bigbluebutton/presentation
ENV TAG v2.2.23 ENV TAG v2.2.26
# 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 \

6
scripts/fs_cli Executable file
View File

@ -0,0 +1,6 @@
#!/bin/bash
set -e
cd $(dirname $0)/..
./scripts/compose exec freeswitch fs_cli -H 10.7.7.1