diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml index 64cfb29..f7149a3 100644 --- a/docker-compose.tmpl.yml +++ b/docker-compose.tmpl.yml @@ -202,6 +202,7 @@ services: FREESWITCH_IP: host.docker.internal FREESWITCH_SIP_IP: ${EXTERNAL_IPv4} ESL_IP: host.docker.internal + ESL_PASSWORD: ${FSESL_PASSWORD:-ClueCon} LOG_LEVEL: info NODE_CONFIG: '{"kurento":[{"ip":"${EXTERNAL_IPv4}","url":"ws://kurento:8888/kurento"}]}' ports: diff --git a/mod/apps-akka/Dockerfile b/mod/apps-akka/Dockerfile index 24b0a6d..c76acb7 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-rc-2 +ENV TAG_COMMON_MESSAGE v2.3.0 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-rc-2 +ENV TAG v2.3.0 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 8e2ffbe..3dbed29 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-rc-2 +ENV TAG_COMMON_MESSAGE v2.3.0 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-rc-2 +ENV TAG_COMMON_WEB v2.3.0 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-rc-2 +ENV TAG_WEB v2.3.0 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-alpha-2/bigbluebutton-config/slides/blank-svg.svg \ - https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3-alpha-2/bigbluebutton-config/slides/blank-thumb.png \ - https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3-alpha-2/bigbluebutton-config/slides/blank-presentation.pdf \ - https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3-alpha-2/bigbluebutton-config/slides/blank-png.png \ + 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 \ && sed -i 's///g' /etc/ImageMagick-6/policy.xml # get bbb-web diff --git a/mod/etherpad/Dockerfile b/mod/etherpad/Dockerfile index c30f82d..cd956e8 100644 --- a/mod/etherpad/Dockerfile +++ b/mod/etherpad/Dockerfile @@ -9,7 +9,7 @@ USER etherpad # only used to trigger a fresh run of the npm install # command without caching -ENV TAG v2.3-beta-4 +ENV TAG v2.3.0 RUN npm install \ git+https://git@github.com/pedrobmarin/ep_pad_ttl.git \ diff --git a/mod/freeswitch/Dockerfile b/mod/freeswitch/Dockerfile index ee39931..fd7c1a1 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-rc-1 +ENV TAG v2.3.0 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 13cfde0..8821fe9 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-rc-2 +ENV TAG_COMMON_MESSAGE v2.3.0 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-rc-2 +ENV TAG_FSESL v2.3.0 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-rc-2 +ENV TAG v2.3.0 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 adbfa1e..2b9fc5a 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-rc-2 +ENV TAG v2.3.0 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-rc-2 +ENV TAG v2.3.0 diff --git a/mod/html5/settings.yml b/mod/html5/settings.yml index 26ba050..e2f907c 100644 --- a/mod/html5/settings.yml +++ b/mod/html5/settings.yml @@ -4,9 +4,9 @@ public: desktopFontSize: 14px audioChatNotification: false autoJoin: true - listenOnlyMode: {{ .Env.LISTEN_ONLY_MODE }} + listenOnlyMode: true forceListenOnly: false - skipCheck: {{ .Env.DISABLE_ECHO_TEST }} + skipCheck: false skipCheckOnJoin: false # # Allow users to change microphone/speaker dinamically @@ -16,11 +16,11 @@ public: # "media.setsinkid.enabled" to make it work properly # enableDynamicAudioDeviceSelection: true # - clientTitle: {{ .Env.CLIENT_TITLE }} + clientTitle: BigBlueButton appName: BigBlueButton HTML5 Client - bbbServerVersion: 2.3-dev-docker + bbbServerVersion: 2.3-dev copyright: '©2021 BigBlueButton Inc.' - html5ClientBuild: "1654-docker" + html5ClientBuild: "1669-docker" helpLink: https://bigbluebutton.org/html5/ lockOnJoin: true cdn: '' @@ -360,6 +360,7 @@ public: enabled: true max_custom: 5 allowDragAndDropFile: false + maxTypedAnswerLength: 45 captions: enabled: true enableDictation: false @@ -463,8 +464,6 @@ public: panZoomThrottle: 32 restoreOnUpdate: false uploadEndpoint: '/bigbluebutton/presentation/upload' - uploadSizeMin: 0 - uploadSizeMax: 50000000 uploadValidMimeTypes: - extension: .pdf mime: application/pdf @@ -504,6 +503,7 @@ public: mime: image/png selectRandomUser: enabled: true + countdown: false user: role_moderator: MODERATOR role_viewer: VIEWER diff --git a/mod/jodconverter/Dockerfile b/mod/jodconverter/Dockerfile index db72351..070db8d 100644 --- a/mod/jodconverter/Dockerfile +++ b/mod/jodconverter/Dockerfile @@ -2,9 +2,11 @@ FROM eugenmayer/jodconverter:rest RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections RUN sed -i 's/main/main contrib/' /etc/apt/sources.list && apt-get update RUN apt-get update && apt -y install --no-install-recommends \ + fonts-arkpandora \ fonts-crosextra-carlito \ fonts-crosextra-caladea \ fonts-noto \ fonts-noto-cjk \ + fonts-liberation \ fontconfig \ ttf-mscorefonts-installer \ No newline at end of file diff --git a/mod/recordings/Dockerfile b/mod/recordings/Dockerfile index 5ed5f3f..3eb6d6e 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-beta-4 +ENV TAG v2.3.0 # add bbb-record-core (lib, scripts and Gemfile) RUN cd /usr/local/bigbluebutton/core \ diff --git a/mod/webhooks/Dockerfile b/mod/webhooks/Dockerfile index 72f235e..0778b04 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-rc-2 +ENV TAG v2.3.0 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 f8a8838..4145f8c 160000 --- a/mod/webrtc-sfu/bbb-webrtc-sfu +++ b/mod/webrtc-sfu/bbb-webrtc-sfu @@ -1 +1 @@ -Subproject commit f8a883850c235da2d9cca330b4f1ec09afc6d96c +Subproject commit 4145f8c1ad9e111bf0d3fe037e9d3be965fe1232