changes for v2.4.5

2024-12-24 15:49:13 +01:00 · 2022-03-21 12:00:36 +01:00 · 2022-03-21 12:00:36 +01:00 · fb75478e67
commit fb75478e67
parent 4eabc35bfe
12 changed files with 69 additions and 24 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,9 +1,11 @@
 # Changelog

 ## Unreleased
-
-## Release v2.4.4-2 (2022-03-19)
+- Applied BBB v2.4.5 changes @alangecker 
+- New mute & unmute sounds by senfcall
+- Update etherpad @pedrobmarin [#202](https://github.com/bigbluebutton/docker/pull/202)
 - Use own freeswitch mirror instead of the official login-only one @alangecker [#203](https://github.com/bigbluebutton/docker/issues/203)
+- Ignore docker-compose.override.yml @dorianim [#183](https://github.com/bigbluebutton/docker/pull/183)

 ## Release v2.4.4 (2022-02-23)
 - Applied v2.4.4 changes @alangecker [#195](https://github.com/bigbluebutton/docker/pull/195)
--- a/README.md
+++ b/README.md
@ -3,7 +3,7 @@

 # 📦 BigBlueButton 2.4 Docker

-Version: 2.4.4 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
+Version: 2.4.5 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)

 ## Features
 - Easy installation
--- a/mod/apps-akka/Dockerfile
+++ b/mod/apps-akka/Dockerfile
@ -3,7 +3,7 @@ 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.4.4
+ENV TAG_COMMON_MESSAGE v2.4.5
 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.4.4
+ENV TAG v2.4.5
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \
    && rm -rf /source/.svn

--- a/mod/bbb-web/Dockerfile
+++ b/mod/bbb-web/Dockerfile
@ -3,7 +3,7 @@ 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.4.4
+ENV TAG_COMMON_MESSAGE v2.4.5
 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.4.4
+ENV TAG_COMMON_WEB v2.4.5
 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.4.4
+ENV TAG_WEB v2.4.5
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \
    && rm -rf /bbb-web/.svn

--- a/mod/etherpad/Dockerfile
+++ b/mod/etherpad/Dockerfile
@ -8,10 +8,10 @@ RUN apt-get update \
 USER etherpad

 RUN npm install  \
-    ep_cursortrace@3.1.12 \
+    ep_cursortrace@3.1.15 \
    git+https://github.com/mconf/ep_pad_ttl.git#360136cd38493dd698435631f2373cbb7089082d \
    git+https://github.com/mconf/ep_redis_publisher.git#1d903bf900dd53ebc5347f9583b6e240cf754d63 \
-    git+https://github.com/ether/ep_disable_chat.git#v0.0.4 \
+    ep_disable_chat@0.0.7 \
 # remove npm lockfile, because somehow it prevents etherpad from detecting the manual added plugin ep_bigbluebutton_patches
    && rm package-lock.json

--- a/mod/etherpad/bbb-etherpad-skin
+++ b/mod/etherpad/bbb-etherpad-skin
@ -1 +1 @@
-Subproject commit 8328b7744abe664e44b7802142eaa48fade63eae
+Subproject commit 91b052c2cc4c169f2e381538e4342e894f944dbe
--- a/mod/freeswitch/Dockerfile
+++ b/mod/freeswitch/Dockerfile
@ -1,10 +1,9 @@
 FROM debian:bullseye-slim

-# add freeswitch repo
+# install dependencies
 RUN apt-get update && \
-apt-get install -y --no-install-recommends subversion curl wget ca-certificates gnupg gnupg2 lsb-release unzip && \
-wget -q -O /usr/share/keyrings/freeswitch-archive-keyring.gpg https://freeswitch-mirror.chandi.it/repo/deb/debian-release/signalwire-freeswitch-repo.gpg && \
-echo 'deb [signed-by=/usr/share/keyrings/freeswitch-archive-keyring.gpg] http://freeswitch-mirror.chandi.it/repo/deb/debian-release/ bullseye main' > /etc/apt/sources.list.d/freeswitch.list
+    apt-get install -y --no-install-recommends \
+    subversion curl wget ca-certificates gnupg gnupg2 lsb-release unzip

 # install dockerize
 ENV DOCKERIZE_VERSION v0.6.1
@ -12,8 +11,12 @@ RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VE
    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
    && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz

+
 # install freeswitch
-RUN apt-get update && apt-get install -y \
+RUN wget -q -O /usr/share/keyrings/freeswitch-archive-keyring.gpg https://freeswitch-mirror.chandi.it/repo/deb/debian-release/signalwire-freeswitch-repo.gpg && \
+    echo 'deb [signed-by=/usr/share/keyrings/freeswitch-archive-keyring.gpg] http://freeswitch-mirror.chandi.it/repo/deb/debian-release/ bullseye main' > /etc/apt/sources.list.d/freeswitch.list && \
+    apt-get update && \
+    apt-get install -y \
        freeswitch \
        freeswitch-mod-commands \
        freeswitch-mod-conference \
@ -25,10 +28,19 @@ RUN apt-get update && apt-get install -y \
        freeswitch-mod-opusfile \
        freeswitch-mod-opus \
        freeswitch-mod-sndfile \
+        freeswitch-mod-spandsp \
        freeswitch-mod-sofia \
        freeswitch-sounds-en-us-callie \
        iptables

+# replace mute & unmute sounds
+RUN wget -q https://gitlab.senfcall.de/senfcall-public/mute-and-unmute-sounds/-/archive/master/mute-and-unmute-sounds-master.zip && \
+    unzip mute-and-unmute-sounds-master.zip && \
+    cd mute-and-unmute-sounds-master/sounds/ && \
+    find . -name "*.wav" -exec /bin/bash -c "echo {};sox -v 0.3 {} /tmp/tmp.wav; mv /tmp/tmp.wav /usr/share/freeswitch/sounds/en/us/callie/conference/{}" \; && \
+    cd ../.. && \
+    rm -r mute-and-unmute-sounds-master mute-and-unmute-sounds-master.zip
+

 # -- get official bbb freeswitch config
 # we use svn for retrieving the files since the repo is quite large,
--- a/mod/freeswitch/conf/autoload_configs/modules.conf.xml
+++ b/mod/freeswitch/conf/autoload_configs/modules.conf.xml
@ -0,0 +1,31 @@
+<configuration name="modules.conf" description="Modules">
+  <modules>
+    <!-- Loggers (I'd load these first) -->
+    <load module="mod_console"/>
+    <load module="mod_logfile"/>
+
+    <!-- Event Handlers -->
+    <load module="mod_event_socket"/>
+
+    <!-- Endpoints -->
+    <load module="mod_sofia"/>
+
+    <!-- Applications -->
+    <load module="mod_commands"/>
+    <load module="mod_conference"/>
+    <load module="mod_dptools"/>
+
+    <!-- Dialplan Interfaces -->
+    <load module="mod_dialplan_xml"/>
+
+    <!-- Codec Interfaces -->
+    <load module="mod_spandsp"/>
+    <load module="mod_opus"/>
+    <load module="mod_opusfile"/>
+
+    <!-- File Format Interfaces -->
+    <load module="mod_sndfile"/>
+    <load module="mod_native_file"/>
+
+  </modules>
+</configuration>
--- a/mod/fsesl-akka/Dockerfile
+++ b/mod/fsesl-akka/Dockerfile
@ -3,7 +3,7 @@ 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.4.1
+ENV TAG_COMMON_MESSAGE v2.4.5
 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.4.1
+ENV TAG_FSESL v2.4.5
 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.4.1
+ENV TAG v2.4.5
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \
    && rm -rf /source/.svn

--- a/mod/html5/Dockerfile
+++ b/mod/html5/Dockerfile
@ -14,7 +14,7 @@ USER meteor
 ENV METEOR_VERSION 2.5
 RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh

-ENV TAG v2.4.4
+ENV TAG v2.4.5
 RUN cd ~ \
    && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
    && mv ~/bigbluebutton-html5 ~/source \
@ -41,4 +41,4 @@ COPY bbb-html5.yml /app/bbb-html5.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.4.2
+ENV TAG v2.4.5
--- a/mod/nginx/Dockerfile
+++ b/mod/nginx/Dockerfile
@ -4,11 +4,11 @@ RUN apk add subversion git

 # --------------------

-ENV TAG_LEARNING_DASHBOARD v2.4.1
+ENV TAG_LEARNING_DASHBOARD v2.4.5
 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 TAG_PLAYBACK v3.3.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
 RUN cd /bbb-playback && npm ci && npm run build
--- a/mod/webrtc-sfu/bbb-webrtc-sfu
+++ b/mod/webrtc-sfu/bbb-webrtc-sfu
@ -1 +1 @@
-Subproject commit fe638ffb8a6ce0584abad0cea44f8ced9e6cc33e
+Subproject commit 3dc34eb558ce2f0e230c358580d8e7e1cd9b8f67