extern/docker
1
0
Fork 1
mirror of https://github.com/bigbluebutton/docker.git synced 2024-11-28 11:04:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-recordings-ffmpeg

Browse Source
This commit is contained in:
chandi Langecker 2022-11-06 13:56:50 +01:00 committed by GitHub
commit f30496d430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,7 +1,7 @@
# Changelog
## Unreleased
- BBB 2.5.4 @alangecker
- BBB 2.5.8 @alangecker
- recordings: fix for missing ffmpeg filter @alangecker [#235](https://github.com/bigbluebutton/docker/issues/235) [#230](https://github.com/bigbluebutton/docker/pull/230)
## Release v2.5.0 (2022-06-10)

2
README.md
View File

@ -3,7 +3,7 @@
# 📦 BigBlueButton 2.5 Docker
Version: 2.5.2 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
Version: 2.5.8 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
## Features
- Easy installation

4
docker-compose.tmpl.yml
View File

@ -210,7 +210,7 @@ services:
# TODO: remove as soon as not required anymore by webrtc-sfu
kurento:
image: kurento/kurento-media-server:6.17
image: kurento/kurento-media-server:6.18
restart: unless-stopped
network_mode: host
volumes:
@ -288,6 +288,8 @@ services:
jodconverter:
build: mod/jodconverter
image: alangecker/bbb-docker-jodconverter:latest
security_opt:
- 'no-new-privileges:true'
restart: unless-stopped
tmpfs:
- /tmp

2
mod/bbb-pads/bbb-pads

@ -1 +1 @@
Subproject commit 3eb45a5099fc3e9def055a8d236e52098777eb95
Subproject commit 64b993ce8e1de5f893b4618d37229bcb57c13b68

2
mod/freeswitch/conf/autoload_configs/conference.conf.xml.tmpl
View File

@ -39,7 +39,7 @@
<!-- Domain (for presence) -->
<param name="domain" value="$${domain}"/>
<!-- Sample Rate-->
<param name="rate" value="8000"/>
<param name="rate" value="48000"/>
<!-- Number of milliseconds per frame -->
<param name="interval" value="20"/>
<!-- Energy level required for audio to be sent to the other users -->

2
mod/html5/entrypoint.sh
View File

@ -6,7 +6,7 @@ export MONGO_OPLOG_URL=mongodb://10.7.7.6/local
export MONGO_URL=mongodb://10.7.7.6/meteor
export ROOT_URL=http://127.0.0.1/html5client
export NODE_ENV=production
export SERVER_WEBSOCKET_COMPRESSION=0
export SERVER_WEBSOCKET_COMPRESSION='{"level":5, "maxWindowBits":13, "memLevel":7, "requestMaxWindowBits":13}'
export BIND_IP=0.0.0.0
export LANG=en_US.UTF-8
export INSTANCE_MAX=1

2
mod/webrtc-sfu/bbb-webrtc-sfu

@ -1 +1 @@
Subproject commit 07723a95bf350181fcb87b5e8c9ebc53eb6d8de6
Subproject commit 19750a1727d6ce4c655e69924f958ab937c4de3a

18
tags.env
View File

@ -7,21 +7,21 @@
BBB_BUILD_TAG=v2022-03-30
# https://github.com/bigbluebutton/bigbluebutton
TAG_COMMON_MESSAGE=v2.5.5
TAG_APPS_AKKA=v2.5.5
TAG_FSESL_AKKA=v2.5.5
TAG_BBB_WEB=v2.5.5
TAG_HTML5=v2.5.5
TAG_RECORDINGS=v2.5.5
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_LEARNING_DASHBOARD=v2.5.5
TAG_FS_CONFIG=v2.5.0
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.2
TAG_WEBRTC_SFU=v2.8.6
TAG_WEBHOOKS=v2.6.0
TAG_PLAYBACK=v4.0.0
TAG_PADS=v1.2.1
TAG_PADS=v1.2.2