diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c48b8f..4710a86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog -## Unreleased +## Unreleases +- Applied v2.4.2 changes @alangecker + +## Release v2.4.0 (2021-12-29) - BigBlueButton v2.4 @alangecker [#159](https://github.com/bigbluebutton/docker/pull/159) - **Breaking change:** change nginx port from `8080` to `48087`. see [upgrade note](docs/upgrading.md) @alangeker [#133](https://github.com/bigbluebutton/docker/issues/133) - Enable optimization for Prometheus Exporter when recording is enabled @omidmaldar [#161](https://github.com/bigbluebutton/docker/pull/161) diff --git a/README.md b/README.md index c6ad205..f764bce 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # 📦 BigBlueButton 2.4 Docker -Version: 2.4.0 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues) +Version: 2.4.2 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues) ## Features - Easy installation diff --git a/mod/apps-akka/Dockerfile b/mod/apps-akka/Dockerfile index 0758a26..d409825 100644 --- 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.0 +ENV TAG_COMMON_MESSAGE v2.4.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.4.0 +ENV TAG v2.4.1 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 2dcf037..214a63f 100644 --- 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.0 +ENV TAG_COMMON_MESSAGE v2.4.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.4.0 +ENV TAG_COMMON_WEB v2.4.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.4.0 +ENV TAG_WEB v2.4.1 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \ && rm -rf /bbb-web/.svn diff --git a/mod/fsesl-akka/Dockerfile b/mod/fsesl-akka/Dockerfile index be10fee..635a718 100644 --- 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.0 +ENV TAG_COMMON_MESSAGE v2.4.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.4.0 +ENV TAG_FSESL v2.4.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.4.0 +ENV TAG v2.4.1 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 62029ee..8a02a27 100644 --- 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.0 +ENV TAG v2.4.2 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.0 +ENV TAG v2.4.2 diff --git a/mod/nginx/Dockerfile b/mod/nginx/Dockerfile index 21026d2..769333d 100644 --- a/mod/nginx/Dockerfile +++ b/mod/nginx/Dockerfile @@ -4,7 +4,7 @@ RUN apk add subversion git # -------------------- -ENV TAG_LEARNING_DASHBOARD v2.4.0 +ENV TAG_LEARNING_DASHBOARD v2.4.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 @@ -17,7 +17,7 @@ RUN cd /bbb-playback && npm ci && npm run build FROM nginx:1.21-alpine -COPY --from=builder /bbb-learning-dashboard/build /www/learning-dashboard +COPY --from=builder /bbb-learning-dashboard/build /www/learning-analytics-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 diff --git a/mod/nginx/bbb/learning-dashboard.nginx b/mod/nginx/bbb/learning-dashboard.nginx index af549bf..d7899bf 100644 --- a/mod/nginx/bbb/learning-dashboard.nginx +++ b/mod/nginx/bbb/learning-dashboard.nginx @@ -1,9 +1,9 @@ -location ~ /learning-dashboard/([0-9a-f]+-[0-9]+)/(.*) { - root /var/bigbluebutton/learning-dashboard/; +location ~ /learning-analytics-dashboard/([0-9a-f]+-[0-9]+)/(.*) { + root /var/bigbluebutton/learning-analytics-dashboard/; autoindex off; } -location /learning-dashboard/ { - alias /www/learning-dashboard/; +location /learning-analytics-dashboard/ { + alias /www/learning-analytics-dashboard/; autoindex off; } diff --git a/mod/periodic/entrypoint.sh b/mod/periodic/entrypoint.sh index abe8606..dd060d8 100755 --- a/mod/periodic/entrypoint.sh +++ b/mod/periodic/entrypoint.sh @@ -14,7 +14,7 @@ do /bbb-resync-freeswitch # delete presentations older than N days - find /var/bigbluebutton/ -maxdepth 1 -type d -name "*-*" -mtime +$history -exec rm -rf '{}' + + find /var/bigbluebutton/ -maxdepth 1 -type d -name "*-[0-9]*" -mtime +$history -exec rm -rf '{}' + # delete recordings older than $RECORDING_MAX_AGE_DAYS if [ "$ENABLE_RECORDING" == true ] && [ "$REMOVE_OLD_RECORDING" == true ]; then diff --git a/mod/webrtc-sfu/bbb-webrtc-sfu b/mod/webrtc-sfu/bbb-webrtc-sfu index 4e0fa6b..1b3fdd6 160000 --- a/mod/webrtc-sfu/bbb-webrtc-sfu +++ b/mod/webrtc-sfu/bbb-webrtc-sfu @@ -1 +1 @@ -Subproject commit 4e0fa6bf8ffc1bb8fbbe4fe9843651331e018188 +Subproject commit 1b3fdd6ccfed03555d788dcba34388dd0288957d diff --git a/scripts/fs_cli b/scripts/fs_cli index 53a79f6..56462bf 100755 --- a/scripts/fs_cli +++ b/scripts/fs_cli @@ -3,4 +3,10 @@ set -e cd $(dirname $0)/.. -docker-compose exec freeswitch fs_cli -H 10.7.7.1 \ No newline at end of file +# load .env +if [ -f .env ] +then + export $(cat .env | sed 's/#.*//g' | grep "FSESL_PASSWORD" | xargs) +fi + +docker-compose exec freeswitch fs_cli -H 10.7.7.1 -p "$FSESL_PASSWORD"