16 Commits

Author SHA1 Message Date
ef295301b5 BBB v2.5.11 2023-01-10 17:24:33 +01:00
cef23f8236 actually checkout the submodules specified in tags.env 2023-01-10 17:19:35 +01:00
d8587b0e33 Release v2.5.8 2022-11-06 14:01:44 +01:00
81c3cacf29 Merge pull request #239 from bigbluebutton/fix-recordings-ffmpeg
update recordings base image to bullseye
2022-11-06 13:57:12 +01:00
f30496d430 Merge branch 'develop' into fix-recordings-ffmpeg 2022-11-06 13:56:50 +01:00
f2fe7959bb Merge pull request #238 from bigbluebutton/v2.5.8
BigBlueButton 2.5.8
2022-11-06 13:56:08 +01:00
bfa6679ff0 add a changelog entry 2022-11-04 17:06:17 +01:00
fc74f2a8b8 update recordings base image to bullseye
bullseye offers a more recent version of ffmpeg which solves the missing ffmpeg filter 'tpad'
https://github.com/bigbluebutton/docker/issues/235
2022-11-04 17:02:56 +01:00
c181ee9665 BBB 2.5.8 2022-11-04 16:50:08 +01:00
ad6b0d2d38 Merge pull request #231 from bigbluebutton/v2.5.5
BigBlueButton v2.5.5
2022-10-03 13:04:07 +02:00
618c432e73 v2.5.5 2022-09-19 21:39:41 +02:00
ca7d2baa38 fix upgrade executable bit 2022-07-01 10:55:28 +02:00
2ff3b8c4e2 BBB 2.5.2 2022-06-23 16:06:02 +02:00
db8c9918b6 Merge pull request #207 from bigbluebutton/v2.5.x
WIP: BigBlueButton 2.5 + several other changes
2022-06-10 23:00:08 +02:00
b3a1b010f9 Merge pull request #205 from lightweight/develop
Update Dockerfile
2022-04-17 13:31:26 +02:00
9f45bdf5bb Update Dockerfile
This should fix issues with failing recordings which include presentation polls.
2022-03-23 11:24:17 +13:00
16 changed files with 41 additions and 30 deletions

View File

@ -1,6 +1,12 @@
# Changelog
## Unreleased
## Release v2.5.8 (2022-11-06)
- BBB 2.5.8 @alangecker [#238](https://github.com/bigbluebutton/docker/pull/238)
- 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)
- BigBlueButton v2.5 @alangecker [#207](https://github.com/bigbluebutton/docker/pull/207)
- central `tags.env` file with the tag names of most BBB components @alangecker
- Usage of [official docker build images](https://gitlab.senfcall.de/senfcall-public/docker-bbb-build) for building @alangecker

View File

@ -1,9 +1,9 @@
<img width="1012" alt="bbb-docker-banner" src="https://user-images.githubusercontent.com/1273169/141153216-0386cd4e-0aaf-473a-8f42-a048e52ed0d7.png">
# 📦 BigBlueButton 2.4 Docker
# 📦 BigBlueButton 2.5 Docker
Version: 2.5.1 | [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

View File

@ -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
@ -156,7 +156,7 @@ services:
etherpad:
build: mod/etherpad
image: alangecker/bbb-docker-etherpad:1.8.18-2
image: alangecker/bbb-docker-etherpad:1.8.18-3
restart: unless-stopped
depends_on:
- redis
@ -193,7 +193,7 @@ services:
mongodb:
container_name: bbb-mongodb
image: mongo:5.0
image: mongo:4.4
restart: unless-stopped
volumes:
- ./mod/mongo/mongod.conf:/etc/mongod.conf
@ -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
@ -387,7 +389,7 @@ services:
{{ if isTrue .Env.ENABLE_COTURN }}
# coturn
coturn:
image: coturn/coturn:4.5-alpine
image: coturn/coturn:4.6-alpine
restart: unless-stopped
command:
- "--external-ip=${EXTERNAL_IPv4}/${EXTERNAL_IPv4}"

View File

@ -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

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 -->

View File

@ -2,7 +2,6 @@
<modules>
<!-- Loggers (I'd load these first) -->
<load module="mod_console"/>
<load module="mod_logfile"/>
<!-- Event Handlers -->
<load module="mod_event_socket"/>

View File

@ -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 && \

View File

@ -6,12 +6,12 @@ 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
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

View File

@ -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

View File

@ -1,5 +1,5 @@
FROM ruby:2.7-slim-buster
FROM ruby:2.7-slim-bullseye
# install apt dependencies
RUN apt-get update && apt-get install -y \

View File

@ -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
}

0
scripts/upgrade Normal file → Executable file
View File

View File

@ -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"

View File

@ -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.0
TAG_APPS_AKKA=v2.5.0
TAG_FSESL_AKKA=v2.5.0
TAG_BBB_WEB=v2.5.0
TAG_HTML5=v2.5.1
TAG_RECORDINGS=v2.5.0
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.0
TAG_FS_CONFIG=v2.5.0
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.2
TAG_WEBRTC_SFU=v2.8.7
TAG_WEBHOOKS=v2.6.0
TAG_PLAYBACK=v4.0.0
TAG_PADS=v1.2.1
TAG_PADS=v1.4.0