From dd98a4c52f2335011ac71a6d1b2f858b414ee5e2 Mon Sep 17 00:00:00 2001 From: chandi Date: Sat, 19 Feb 2022 17:55:25 +0100 Subject: [PATCH 1/2] applied v2.4.4 changes --- CHANGELOG.md | 4 ++-- README.md | 2 +- mod/apps-akka/Dockerfile | 4 ++-- mod/bbb-web/Dockerfile | 6 +++--- mod/etherpad/Dockerfile | 6 +++--- mod/html5/Dockerfile | 2 +- mod/recordings/Dockerfile | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4710a86..f6e7500 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog -## Unreleases -- Applied v2.4.2 changes @alangecker +## Unreleased +- Applied v2.4.4 changes @alangecker ## Release v2.4.0 (2021-12-29) - BigBlueButton v2.4 @alangecker [#159](https://github.com/bigbluebutton/docker/pull/159) diff --git a/README.md b/README.md index f764bce..17a80ef 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # 📦 BigBlueButton 2.4 Docker -Version: 2.4.2 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues) +Version: 2.4.4 | [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 d409825..53972ba 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.1 +ENV TAG_COMMON_MESSAGE v2.4.4 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.1 +ENV TAG v2.4.4 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 214a63f..77a51ec 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.1 +ENV TAG_COMMON_MESSAGE v2.4.4 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.1 +ENV TAG_COMMON_WEB v2.4.4 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.1 +ENV TAG_WEB v2.4.4 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \ && rm -rf /bbb-web/.svn diff --git a/mod/etherpad/Dockerfile b/mod/etherpad/Dockerfile index 0aa80fa..88a0eec 100644 --- a/mod/etherpad/Dockerfile +++ b/mod/etherpad/Dockerfile @@ -9,11 +9,11 @@ USER etherpad # ep_cursortrace: using mconf's fork due to https://github.com/ether/ep_cursortrace/pull/25 not being accepted upstream RUN npm install \ - ep_cursortrace@3.1.11 \ + ep_cursortrace@3.1.12 \ git+https://github.com/pedrobmarin/ep_pad_ttl.git#360136cd38493dd698435631f2373cbb7089082d \ git+https://github.com/pedrobmarin/ep_redis_publisher.git#1d903bf900dd53ebc5347f9583b6e240cf754d63 \ - git+https://github.com/ether/ep_disable_chat.git#v0.0.3 \ - git+https://github.com/ether/ep_sticky_attributes.git#v0.1.9 \ + git+https://github.com/ether/ep_disable_chat.git#v0.0.4 \ + git+https://github.com/ether/ep_sticky_attributes.git#v0.1.10 \ # remove npm lockfile, because somehow it prevents etherpad from detecting the manual added plugin ep_bigbluebutton_patches && rm package-lock.json diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile index 8a02a27..0093c55 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.2 +ENV TAG v2.4.4 RUN cd ~ \ && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \ && mv ~/bigbluebutton-html5 ~/source \ diff --git a/mod/recordings/Dockerfile b/mod/recordings/Dockerfile index 9e55053..36b5d3a 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.4.0 +ENV TAG v2.4.4 # add bbb-record-core (lib, scripts and Gemfile) RUN cd /usr/local/bigbluebutton/core \ From ab283b2c5ce8530782b0d8b8d92f09668a41f79f Mon Sep 17 00:00:00 2001 From: chandi Date: Tue, 22 Feb 2022 01:05:33 +0100 Subject: [PATCH 2/2] fix wrong bbb-webrtc-sfu version --- mod/webrtc-sfu/bbb-webrtc-sfu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/webrtc-sfu/bbb-webrtc-sfu b/mod/webrtc-sfu/bbb-webrtc-sfu index 1b3fdd6..fe638ff 160000 --- a/mod/webrtc-sfu/bbb-webrtc-sfu +++ b/mod/webrtc-sfu/bbb-webrtc-sfu @@ -1 +1 @@ -Subproject commit 1b3fdd6ccfed03555d788dcba34388dd0288957d +Subproject commit fe638ffb8a6ce0584abad0cea44f8ced9e6cc33e