Merge pull request #248 from bigbluebutton/v2.5.10

BigBlueButton v2.5.11

docker-compose.tmpl.yml

@@ -136,7 +136,7 @@ services:
       context: mod/nginx
       args:
         TAG_LEARNING_DASHBOARD: {{ .Env.TAG_LEARNING_DASHBOARD }}
-    image: alangecker/bbb-docker-nginx:1.21-{{ .Env.TAG_PLAYBACK }}-{{ .Env.TAG_LEARNING_DASHBOARD }}
+    image: alangecker/bbb-docker-nginx:1.23-{{ .Env.TAG_PLAYBACK }}-{{ .Env.TAG_LEARNING_DASHBOARD }}
     restart: unless-stopped
     depends_on:
       - etherpad

mod/bbb-pads/bbb-pads

@@ -1 +1 @@
-Subproject commit 64b993ce8e1de5f893b4618d37229bcb57c13b68
+Subproject commit 61f89b6202723e2bab4997a8b27fb08d01948faa

mod/bbb-web/entrypoint.sh

@@ -24,6 +24,6 @@ cd /usr/share/bbb-web/
 dockerize \
     -template /etc/bigbluebutton/bbb-web.properties.tmpl:/etc/bigbluebutton/bbb-web.properties \
     -template /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml.tmpl:/usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml \
-    gosu bigbluebutton java -Dgrails.env=prod -Dserver.address=0.0.0.0 -Dserver.port=8090 -Xms384m -Xmx384m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/bigbluebutton/diagnostics -cp WEB-INF/lib/*:/:WEB-INF/classes/:. org.springframework.boot.loader.WarLauncher
+    gosu bigbluebutton java -Dgrails.env=prod -Dserver.address=0.0.0.0 -Dserver.port=8090 -Dspring.main.allow-circular-references=true -Xms384m -Xmx384m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/bigbluebutton/diagnostics -cp WEB-INF/lib/*:/:WEB-INF/classes/:. org.springframework.boot.loader.WarLauncher
 
 

mod/html5/Dockerfile

@@ -21,7 +21,7 @@ RUN sed -i "s/VERSION/$TAG_HTML5/" /app/bundle/programs/web.browser/head.html \
 
 # ------------------------------
 
-FROM node:14.19.1-alpine
+FROM node:14.21.1-alpine
 
 RUN addgroup -g 2000 meteor && \
     adduser -D -u 2001 -G meteor meteor && \

mod/html5/entrypoint.sh

@@ -11,7 +11,7 @@ export BIND_IP=0.0.0.0
 export LANG=en_US.UTF-8
 export INSTANCE_MAX=1
 export ENVIRONMENT_TYPE=production
-export NODE_VERSION=node-v14.19.1-linux-x64
+export NODE_VERSION=node-v14.21.1-linux-x64
 export BBB_HTML5_LOCAL_SETTINGS=/app/bbb-html5.yml
 
 if [ "$DEV_MODE" == true ]; then

mod/nginx/Dockerfile

@@ -13,7 +13,7 @@ RUN cd /bbb-playback && npm ci && npm run build
 
 # --------------------
 
-FROM nginx:1.21-alpine
+FROM nginx:1.23-alpine
 
 COPY --from=builder /bbb-learning-dashboard/build /www/learning-analytics-dashboard/
 COPY --from=builder /bbb-playback/build /www/playback/presentation/2.3

mod/webrtc-sfu/bbb-webrtc-sfu

@@ -1 +1 @@
-Subproject commit 19750a1727d6ce4c655e69924f958ab937c4de3a
+Subproject commit e7c08cf8a7ff9ec61e16e9ff3834fe39b4df165f

scripts/checkout-submodules

@@ -7,13 +7,18 @@
 set -e
 cd "$(dirname "$0")/.."
 
+git submodule init
+git submodule update
+
 export $(cat tags.env | sed 's/#.*//g' | xargs)
 
 function checkout {
     path=$1
     ref=$2
     pushd $path
+    git fetch
     git checkout $ref
+    echo ""
     popd > /dev/null
 }
 

scripts/upgrade-and-build

@@ -17,8 +17,7 @@ else
 
     echo ""
     echo "# pull newest git submodules"
-    git submodule init
-    git submodule update
+    ./scripts/checkout-submodules
 
     echo ""
     echo "# recreate docker-compose.yml"

tags.env

@@ -4,24 +4,24 @@
 
 
 # https://gitlab.senfcall.de/senfcall-public/docker-bbb-build
-BBB_BUILD_TAG=v2022-03-30
+BBB_BUILD_TAG=v2022-12-08-meteor-290
 
 # https://github.com/bigbluebutton/bigbluebutton
-TAG_COMMON_MESSAGE=v2.5.7
-TAG_APPS_AKKA=v2.5.7
-TAG_FSESL_AKKA=v2.5.7
-TAG_BBB_WEB=v2.5.8
-TAG_HTML5=v2.5.7
-TAG_RECORDINGS=v2.5.7
+TAG_COMMON_MESSAGE=v2.5.10
+TAG_APPS_AKKA=v2.5.10
+TAG_FSESL_AKKA=v2.5.10
+TAG_BBB_WEB=v2.5.11
+TAG_HTML5=v2.5.10
+TAG_RECORDINGS=v2.5.10
 
-TAG_LEARNING_DASHBOARD=v2.5.5
+TAG_LEARNING_DASHBOARD=v2.5.10
 TAG_FS_CONFIG=v2.5.7
 
 
 # individual git submodules
 # use `./scripts/checkout-submodules` to ensure, that the submodules
 # match the provided tags here
-TAG_WEBRTC_SFU=v2.8.6
+TAG_WEBRTC_SFU=v2.8.7
 TAG_WEBHOOKS=v2.6.0
 TAG_PLAYBACK=v4.0.0
-TAG_PADS=v1.2.2
+TAG_PADS=v1.4.0